The branch stable/13 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1b957df8f8f2a24fdbc95690d9c1f615194bcc64

commit 1b957df8f8f2a24fdbc95690d9c1f615194bcc64
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2021-03-03 18:02:13 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2021-08-14 10:21:58 +0000

    ffs_mount: when remounting ro->rw and sbupdate failed, cleanup softdeps
    
    (cherry picked from commit f776c54cee81b4297b59ffe87a0f154e3924ee7f)
---
 sys/ufs/ffs/ffs_vfsops.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 28b8175a42dd..d321e98e8347 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -645,6 +645,8 @@ ffs_mount(struct mount *mp)
                        fs->fs_clean = 0;
                        if ((error = ffs_sbupdate(ump, MNT_WAIT, 0)) != 0) {
                                fs->fs_ronly = 1;
+                               if ((fs->fs_flags & FS_DOSOFTDEP) != 0)
+                                       softdep_unmount(mp);
                                MNT_ILOCK(mp);
                                mp->mnt_flag |= saved_mnt_flag;
                                MNT_IUNLOCK(mp);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to