svn commit: r226688 - head/sys/fs/nullfs

[Konstantin Belousov]

Author: kib
Date: Mon Oct 24 13:56:31 2011
New Revision: 226688
URL: http://svn.freebsd.org/changeset/base/226688

Log:
  The use of VOP_ISLOCKED() without a check for the return values can cause
  false positives. Replace the #ifdef block with the proper
  ASSERT_VOP_UNLOCKED() assert.
  
  Tested by:	pho
  MFC after:	1 week

Modified:
  head/sys/fs/nullfs/null_vfsops.c

Modified: head/sys/fs/nullfs/null_vfsops.c
==============================================================================
--- head/sys/fs/nullfs/null_vfsops.c	Mon Oct 24 13:53:32 2011	(r226687)
+++ head/sys/fs/nullfs/null_vfsops.c	Mon Oct 24 13:56:31 2011	(r226688)
@@ -242,10 +242,7 @@ nullfs_root(mp, flags, vpp)
 	vp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
 	VREF(vp);
 
-#ifdef NULLFS_DEBUG
-	if (VOP_ISLOCKED(vp))
-		panic("root vnode is locked.\n");
-#endif
+	ASSERT_VOP_UNLOCKED(vp, "root vnode is locked");
 	vn_lock(vp, flags | LK_RETRY);
 	*vpp = vp;
 	return 0;