Author: vangyzen
Date: Fri Nov 30 04:18:31 2018
New Revision: 341281
URL: https://svnweb.freebsd.org/changeset/base/341281

Log:
  Add assertions and comment to vm_object_vnode()
  
  Reviewed by:  kib
  MFC after:    2 weeks
  Sponsored by: Dell EMC Isilon
  Differential Revision:        https://reviews.freebsd.org/D2724

Modified:
  head/sys/vm/vm_object.c

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c     Fri Nov 30 04:15:56 2018        (r341280)
+++ head/sys/vm/vm_object.c     Fri Nov 30 04:18:31 2018        (r341281)
@@ -2306,16 +2306,28 @@ next_page:
        }
 }
 
+/*
+ * Return the vnode for the given object, or NULL if none exists.
+ * For tmpfs objects, the function may return NULL if there is
+ * no vnode allocated at the time of the call.
+ */
 struct vnode *
 vm_object_vnode(vm_object_t object)
 {
+       struct vnode *vp;
 
        VM_OBJECT_ASSERT_LOCKED(object);
-       if (object->type == OBJT_VNODE)
-               return (object->handle);
-       if (object->type == OBJT_SWAP && (object->flags & OBJ_TMPFS) != 0)
-               return (object->un_pager.swp.swp_tmpfs);
-       return (NULL);
+       if (object->type == OBJT_VNODE) {
+               vp = object->handle;
+               KASSERT(vp != NULL, ("%s: OBJT_VNODE has no vnode", __func__));
+       } else if (object->type == OBJT_SWAP &&
+           (object->flags & OBJ_TMPFS) != 0) {
+               vp = object->un_pager.swp.swp_tmpfs;
+               KASSERT(vp != NULL, ("%s: OBJT_TMPFS has no vnode", __func__));
+       } else {
+               vp = NULL;
+       }
+       return (vp);
 }
 
 static int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to