xnu-344.2.tar.gz

[apple/xnu.git] / bsd / kern / ubc_subr.c

diff --git a/bsd/kern/ubc_subr.c b/bsd/kern/ubc_subr.c
index 32a5924cb79e2b8e58c87c98d5567b5aee32f0e9..955b6b638e5702d987244782c36e872475bcfb14 100644 (file)
--- 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 */
@@ -322,13 +322,10 @@ ubc_setsize(struct vnode *vp, off_t nsize)
 
 /*
  * Get the size of the file
- * For local file systems the size is locally cached. For NFS
- * there might be a network transaction for this.
  */
 off_t
 ubc_getsize(struct vnode *vp)
 {
-       /* XXX deal with NFS */
        return (vp->v_ubcinfo->ui_size);
 }
 
@@ -1026,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);