d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- spell VOP_LOCK(vp, LK_RELEASE... VOP_UNLOCK(vp,... so that asserts in

Browse Source 
vop_lock_post do not trigger.
 - Rearrange null_inactive to null_hashrem earlier so there is no chance
   of finding the null node on the hash list after the locks have been
   switched.
 - We should never have a NULL lowervp in null_reclaim() so there is
   no need to handle this situation.  panic instead.

MFC After:	1 week
This commit is contained in:
Jeff Roberson 2006-02-22 06:17:31 +00:00
parent 9c12e63100
commit f5cacb3964
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/fs/nullfs/null_vnops.c
View File

@ -567,7 +567,7 @@ null_lock(struct vop_lock_args *ap)
panic("Unsupported lock request %d\n",
ap->a_flags);
}
VOP_LOCK(lvp, LK_RELEASE, td);
VOP_UNLOCK(lvp, 0, td);
error = vop_stdlock(ap);
}
vdrop(lvp);
@ -652,23 +652,23 @@ null_reclaim(struct vop_reclaim_args *ap)
struct vnode *lowervp = xp->null_lowervp;
struct lock *vnlock;
if (lowervp)
null_hashrem(xp);
/*
* Use the interlock to protect the clearing of v_data to
* prevent faults in null_lock().
*/
VI_LOCK(vp);
vp->v_data = NULL;
vp->v_object = NULL;
vnlock = vp->v_vnlock;
vp->v_vnlock = &vp->v_lock;
lockmgr(vp->v_vnlock, LK_EXCLUSIVE|LK_INTERLOCK, VI_MTX(vp), curthread);
if (lowervp)
null_hashrem(xp);
vp->v_object = NULL;
if (lowervp) {
lockmgr(vp->v_vnlock,
LK_EXCLUSIVE|LK_INTERLOCK, VI_MTX(vp), curthread);
vput(lowervp);
} else
lockmgr(vnlock, LK_RELEASE, NULL, curthread);
panic("null_reclaim: reclaiming an node with now lowervp");
FREE(xp, M_NULLFSNODE);
return (0);
@ -678,6 +678,7 @@ static int
null_print(struct vop_print_args *ap)
{
struct vnode *vp = ap->a_vp;
printf("\tvp=%p, lowervp=%p\n", vp, NULLVPTOLOWERVP(vp));
return (0);
}