svn commit: r342610 - head/sys/ufs/ufs

Kirk McKusick mckusick at FreeBSD.org
Sun Dec 30 06:03:21 UTC 2018


Author: mckusick
Date: Sun Dec 30 06:03:20 2018
New Revision: 342610
URL: https://svnweb.freebsd.org/changeset/base/342610

Log:
  Move ASSERT_VOP_LOCKED to top of ufs_vinit() as it should be true
  when the function is entered.
  
  Suggested by: kib

Modified:
  head/sys/ufs/ufs/ufs_vnops.c

Modified: head/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- head/sys/ufs/ufs/ufs_vnops.c	Sun Dec 30 05:03:41 2018	(r342609)
+++ head/sys/ufs/ufs/ufs_vnops.c	Sun Dec 30 06:03:20 2018	(r342610)
@@ -2515,6 +2515,7 @@ ufs_vinit(mntp, fifoops, vpp)
 	struct vnode *vp;
 
 	vp = *vpp;
+	ASSERT_VOP_LOCKED(vp, "ufs_vinit");
 	ip = VTOI(vp);
 	vp->v_type = IFTOVT(ip->i_mode);
 	/*
@@ -2524,7 +2525,6 @@ ufs_vinit(mntp, fifoops, vpp)
 		return (EINVAL);
 	if (vp->v_type == VFIFO)
 		vp->v_op = fifoops;
-	ASSERT_VOP_LOCKED(vp, "ufs_vinit");
 	if (ip->i_number == UFS_ROOTINO)
 		vp->v_vflag |= VV_ROOT;
 	*vpp = vp;


More information about the svn-src-head mailing list