Author: kib
Date: Tue Nov 1 15:56:15 2011
New Revision: 226993
URL: http://svn.freebsd.org/changeset/base/226993
Log:
MFC r226688:
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.
Modified:
stable/8/sys/fs/nullfs/null_vfsops.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/fs/nullfs/null_vfsops.c
==============================================================================
--- stable/8/sys/fs/nullfs/null_vfsops.c Tue Nov 1 15:53:44 2011
(r226992)
+++ stable/8/sys/fs/nullfs/null_vfsops.c Tue Nov 1 15:56:15 2011
(r226993)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
