git: 2af934cc15bd - main - Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called

[Konstantin Belousov]

The branch main has been updated by kib:

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

commit 2af934cc15bd8e7daa2daeb806321d0daddf3b7a
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-03-03 19:40:34 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-03-12 11:31:08 +0000

    Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called
    
    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 584a20adb54d..321ed03f7f67 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1355,6 +1355,7 @@ out:
 			free(mp->mnt_gjprovider, M_UFSMNT);
 			mp->mnt_gjprovider = NULL;
 		}
+		MPASS(ump->um_softdep == NULL);
 		free(ump, M_UFSMNT);
 		mp->mnt_data = NULL;
 	}
@@ -1537,6 +1538,7 @@ ffs_unmount(mp, mntflags)
 	UFS_UNLOCK(ump);
 	if (MOUNTEDSOFTDEP(mp))
 		softdep_unmount(mp);
+	MPASS(ump->um_softdep == NULL);
 	if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) {
 		fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1;
 		error = ffs_sbupdate(ump, MNT_WAIT, 0);