The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=76b05e3e399133b59fc3e740cab9ae362358c9d6
commit 76b05e3e399133b59fc3e740cab9ae362358c9d6
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-11-01 08:04:27 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-11-12 23:00:33 +0000
ffs: Remove assertions about locked um_devvp in several places
Namely, ffs_blkfree_cg(), and ffs_flushfiles().
Reported and tested by: pho
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D32761
---
sys/ufs/ffs/ffs_alloc.c | 7 +++++--
sys/ufs/ffs/ffs_vfsops.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 6a262a798d1b..42708e3dce71 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -2251,9 +2251,12 @@ ffs_blkfree_cg(ump, fs, devvp, bno, size, inum, dephd)
MPASS(devvp->v_mount->mnt_data == ump);
dev = ump->um_devvp->v_rdev;
} else if (devvp->v_type == VCHR) {
- /* devvp is a normal disk device */
+ /*
+ * devvp is a normal disk device
+ * XXXKIB: devvp is not locked there, v_rdev access depends on
+ * busy mount, which prevents mntfs devvp from reclamation.
+ */
dev = devvp->v_rdev;
- ASSERT_VOP_LOCKED(devvp, "ffs_blkfree_cg");
} else
return;
#ifdef INVARIANTS
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index d1773402002e..d9fb02c2bd58 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1511,7 +1511,7 @@ ffs_flushfiles(mp, flags, td)
*/
}
#endif
- ASSERT_VOP_LOCKED(ump->um_devvp, "ffs_flushfiles");
+ /* devvp is not locked there */
if (ump->um_devvp->v_vflag & VV_COPYONWRITE) {
if ((error = vflush(mp, 0, SKIPSYSTEM | flags, td)) != 0)
return (error);
