diff options
| author | ssouhlal <ssouhlal@FreeBSD.org> | 2005-09-02 15:49:55 +0000 |
|---|---|---|
| committer | ssouhlal <ssouhlal@FreeBSD.org> | 2005-09-02 15:49:55 +0000 |
| commit | 45954b5047007cc1ac0c3fe9d2b852b22b5aea29 (patch) | |
| tree | 27be8011bc32338200fe7e590d18f1cf1e02da73 /sys/fs/nullfs | |
| parent | f8217f350bcfc82b94c814a04faf8cdd5326d033 (diff) | |
| download | FreeBSD-src-45954b5047007cc1ac0c3fe9d2b852b22b5aea29.zip FreeBSD-src-45954b5047007cc1ac0c3fe9d2b852b22b5aea29.tar.gz | |
Use vput() instead of vrele() in null_reclaim() since the lower vnode
is locked.
MFC after: 3 days
Diffstat (limited to 'sys/fs/nullfs')
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index e7f9f76..0f404dd 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -634,16 +634,17 @@ null_reclaim(struct vop_reclaim_args *ap) VI_LOCK(vp); vp->v_data = NULL; VI_UNLOCK(vp); - if (lowervp) { + if (lowervp) null_hashrem(xp); - vrele(lowervp); - } vp->v_object = NULL; vnlock = vp->v_vnlock; vp->v_vnlock = &vp->v_lock; lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL, curthread); - lockmgr(vnlock, LK_RELEASE, NULL, curthread); + if (lowervp) { + vput(lowervp); + } else + lockmgr(vnlock, LK_RELEASE, NULL, curthread); FREE(xp, M_NULLFSNODE); return (0); |
