Page MenuHomeFreeBSD
Files F163421644

D51696.id159624.diff
No OneTemporary
Actions

D51696.id159624.diff
View Options

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -14522,7 +14522,7 @@
BUF_UNLOCK(bp);
if (waitfor != MNT_WAIT)
return (NULL);
-#ifdef DEBUG_VFS_LOCKS
+#ifdef INVARIANTS
if (bp->b_vp->v_type != VCHR)
ASSERT_BO_WLOCKED(bp->b_bufobj);
#endif
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -508,9 +508,9 @@
case LK_EXCLUSIVE:
flags = ap->a_flags;
for (;;) {
-#ifdef DEBUG_VFS_LOCKS
+#ifdef INVARIANTS
VNPASS(vp->v_holdcnt != 0, vp);
-#endif /* DEBUG_VFS_LOCKS */
+#endif
lkp = vp->v_vnlock;
result = lockmgr_lock_flags(lkp, flags,
&VI_MTX(vp)->lock_object, ap->a_file, ap->a_line);
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -230,7 +230,7 @@
bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
-#ifdef DEBUG_VFS_LOCKS
+#ifdef INVARIANTS
/*
* Assert that the directory vnode is locked, and locked
* exclusively for the last component lookup for modifying
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -1278,7 +1278,7 @@
struct uio auio;
int dqvplocked, error;
-#ifdef DEBUG_VFS_LOCKS
+#ifdef INVARIANTS
if (vp != NULLVP)
ASSERT_VOP_ELOCKED(vp, "dqget");
#endif
@@ -1553,7 +1553,7 @@
struct mount *mp;
struct ufsmount *ump;
-#ifdef DEBUG_VFS_LOCKS
+#ifdef INVARIANTS
if (vp != NULL)
ASSERT_VOP_ELOCKED(vp, "dqsync");
#endif

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 1:58 AM (6 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35424512
Default Alt Text
D51696.id159624.diff (1 KB)

Event Timeline