summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/fs/nullfs/null_vnops.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index fd421e4..e04b4d1 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -683,14 +683,15 @@ null_reclaim(struct vop_reclaim_args *ap)
* Use the interlock to protect the clearing of v_data to
* prevent faults in null_lock().
*/
+ lockmgr(&vp->v_lock, LK_EXCLUSIVE, NULL);
VI_LOCK(vp);
vp->v_data = NULL;
vp->v_object = NULL;
vp->v_vnlock = &vp->v_lock;
- if (lowervp) {
- lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_INTERLOCK, VI_MTX(vp));
+ VI_UNLOCK(vp);
+ if (lowervp)
vput(lowervp);
- } else
+ else
panic("null_reclaim: reclaiming a node with no lowervp");
free(xp, M_NULLFSNODE);
OpenPOWER on IntegriCloud