X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d52fe63fc81f7e44faaae711812a211a78434976..9bccf70c0258c7cac2dcb80011b2a964d884c552:/bsd/kern/ubc_subr.c

diff --git a/bsd/kern/ubc_subr.c b/bsd/kern/ubc_subr.c
index c82fd94a2..955b6b638 100644
--- a/bsd/kern/ubc_subr.c
+++ b/bsd/kern/ubc_subr.c
@@ -55,7 +55,7 @@
 #undef assert()
 #endif
 #define assert(cond)    \
-    if (!(cond)) panic("%s:%d (%s)", __FILE__, __LINE__, # cond)
+    ((void) ((cond) ? 0 : panic("%s:%d (%s)", __FILE__, __LINE__, # cond)))
 #else
 #include <kern/assert.h>
 #endif /* DIAGNOSTIC */
@@ -1023,6 +1023,13 @@ ubc_isinuse(struct vnode *vp, int tookref)
 	if (!UBCINFOEXISTS(vp))
 		return (0);
 
+	if (tookref == 0) {
+		printf("ubc_isinuse: called without a valid reference"
+		    ": v_tag = %d\v", vp->v_tag);
+		vprint("ubc_isinuse", vp);
+		return (0);
+	}
+
 	if (vp->v_usecount > busycount)
 		return (1);