git: f14006ee899f - stable/13 - Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called
Konstantin Belousov
kib at FreeBSD.org
Sat Aug 14 10:22:31 UTC 2021
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=f14006ee899f3bc44056d98f4fc915b8976c2302
commit f14006ee899f3bc44056d98f4fc915b8976c2302
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-03-03 19:40:34 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-08-14 10:21:58 +0000
Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called
(cherry picked from commit 2af934cc15bd8e7daa2daeb806321d0daddf3b7a)
---
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 d321e98e8347..85c7929550fb 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);
More information about the dev-commits-src-all
mailing list