diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2011-10-24 13:56:31 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2011-10-24 13:56:31 +0000 |
| commit | 17edcd764da6b60f447e2049a26bfe349ad1302a (patch) | |
| tree | 7eff2c5e0ada69798f376d685e4b49d0991a1232 /sys | |
| parent | 234ab7412e398025a9669055abb1085644347275 (diff) | |
| download | src-17edcd764da6b60f447e2049a26bfe349ad1302a.tar.gz src-17edcd764da6b60f447e2049a26bfe349ad1302a.zip | |
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
Notes
Notes:
svn path=/head/; revision=226688
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index fd20151f7c55..8c00f870d1ab 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -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; |