Commit f14006ee authored by Konstantin Belousov's avatar Konstantin Belousov
Browse files

Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called

(cherry picked from commit 2af934cc)
parent 1b957df8
...@@ -1355,6 +1355,7 @@ ffs_mountfs(odevvp, mp, td) ...@@ -1355,6 +1355,7 @@ ffs_mountfs(odevvp, mp, td)
free(mp->mnt_gjprovider, M_UFSMNT); free(mp->mnt_gjprovider, M_UFSMNT);
mp->mnt_gjprovider = NULL; mp->mnt_gjprovider = NULL;
} }
MPASS(ump->um_softdep == NULL);
free(ump, M_UFSMNT); free(ump, M_UFSMNT);
mp->mnt_data = NULL; mp->mnt_data = NULL;
} }
...@@ -1537,6 +1538,7 @@ ffs_unmount(mp, mntflags) ...@@ -1537,6 +1538,7 @@ ffs_unmount(mp, mntflags)
UFS_UNLOCK(ump); UFS_UNLOCK(ump);
if (MOUNTEDSOFTDEP(mp)) if (MOUNTEDSOFTDEP(mp))
softdep_unmount(mp); softdep_unmount(mp);
MPASS(ump->um_softdep == NULL);
if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) { if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) {
fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1; fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1;
error = ffs_sbupdate(ump, MNT_WAIT, 0); error = ffs_sbupdate(ump, MNT_WAIT, 0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment