git: f776c54cee81 - main - ffs_mount: when remounting ro->rw and sbupdate failed, cleanup softdeps

[Konstantin Belousov]

The branch main has been updated by kib:

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

commit f776c54cee81b4297b59ffe87a0f154e3924ee7f
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-03-03 18:02:13 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-03-12 11:31:08 +0000

    ffs_mount: when remounting ro->rw and sbupdate failed, cleanup softdeps
    
    Reviewed by:    mckusick
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
    MFC after:      2 weeks
    Differential revision:  https://reviews.freebsd.org/D29178
---
 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 273d6e497955..584a20adb54d 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);