Date: Tue, 1 Nov 2011 15:41:55 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r226990 - stable/9/sys/fs/nullfs Message-ID: <201111011541.pA1FftZO072926@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Nov 1 15:41:55 2011 New Revision: 226990 URL: http://svn.freebsd.org/changeset/base/226990 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. Approved by: re (bz) Modified: stable/9/sys/fs/nullfs/null_vfsops.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/fs/nullfs/null_vfsops.c ============================================================================== --- stable/9/sys/fs/nullfs/null_vfsops.c Tue Nov 1 15:38:41 2011 (r226989) +++ stable/9/sys/fs/nullfs/null_vfsops.c Tue Nov 1 15:41:55 2011 (r226990) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111011541.pA1FftZO072926>