From cdeb72045beed58ffdf4e86ccb3035a3da95aece Mon Sep 17 00:00:00 2001 From: Suleiman Souhlal Date: Fri, 2 Sep 2005 15:49:55 +0000 Subject: [PATCH] Use vput() instead of vrele() in null_reclaim() since the lower vnode is locked. MFC after: 3 days --- sys/fs/nullfs/null_vnops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index e7f9f76530d..0f404dd2bc2 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);