diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-05-27 13:10:16 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-05-27 13:10:16 +0000 |
commit | b3193c8a4355ab3734d543c64062ac0269de5b0d (patch) | |
tree | b74c76668a600f1a34c0b2d386d1a346f3ac6fbf /sys/fs/nullfs | |
parent | ba0252cfbabf40b1537e26f5840943a8ab6e9325 (diff) | |
download | FreeBSD-src-b3193c8a4355ab3734d543c64062ac0269de5b0d.zip FreeBSD-src-b3193c8a4355ab3734d543c64062ac0269de5b0d.tar.gz |
Rather than entering the debugger via kdb_enter() in the event the
root vnode is unexpectedly locked under NULLFS_DEBUG in nullfs and
then returning EDEADLK, panic.
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 7094cfb..dd2bab2 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -248,11 +248,8 @@ nullfs_root(mp, flags, vpp, td) VREF(vp); #ifdef NULLFS_DEBUG - if (VOP_ISLOCKED(vp, NULL)) { - kdb_enter("root vnode is locked.\n"); - vrele(vp); - return (EDEADLK); - } + if (VOP_ISLOCKED(vp, NULL)) + panic("root vnode is locked.\n"); #endif vn_lock(vp, flags | LK_RETRY, td); *vpp = vp; |