[Midnightbsd-cvs] src [8532] trunk/sys/kern/vfs_subr.c: assert_vop_locked should treat LKEXCLOTHER as the not locked case.

[laffer1 at midnightbsd.org]

Revision: 8532
          http://svnweb.midnightbsd.org/src/?rev=8532
Author:   laffer1
Date:     2016-09-19 09:48:45 -0400 (Mon, 19 Sep 2016)
Log Message:
-----------
assert_vop_locked should treat LKEXCLOTHER as the not locked case.

Modified Paths:
--------------
    trunk/sys/kern/vfs_subr.c

Modified: trunk/sys/kern/vfs_subr.c
===================================================================
--- trunk/sys/kern/vfs_subr.c	2016-09-19 13:48:14 UTC (rev 8531)
+++ trunk/sys/kern/vfs_subr.c	2016-09-19 13:48:45 UTC (rev 8532)
@@ -3970,9 +3970,13 @@
 void
 assert_vop_locked(struct vnode *vp, const char *str)
 {
+	int locked;
 
-	if (!IGNORE_LOCK(vp) && VOP_ISLOCKED(vp) == 0)
-		vfs_badlock("is not locked but should be", str, vp);
+	if (!IGNORE_LOCK(vp)) {
+		locked = VOP_ISLOCKED(vp);
+		if (locked == 0 || locked == LK_EXCLOTHER)
+			vfs_badlock("is not locked but should be", str, vp);
+	}
 }
 
 void