diff options
| author | jeff <jeff@FreeBSD.org> | 2005-04-13 10:57:53 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2005-04-13 10:57:53 +0000 |
| commit | 5642885b84d3a8dfdbf202dfbab02e5c4a93576f (patch) | |
| tree | e38ea83b31dc5fa636a733f3528a08c6eb4f3563 /sys/kern | |
| parent | ee55350db0df9355dc355166596611b59aa29ed1 (diff) | |
| download | FreeBSD-src-5642885b84d3a8dfdbf202dfbab02e5c4a93576f.zip FreeBSD-src-5642885b84d3a8dfdbf202dfbab02e5c4a93576f.tar.gz | |
- Change vop_lookup_post assertions to reflect recent vfs_lookup changes.
Sponsored by: Isilon Systems, Inc.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_subr.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5fe1611..ce1cab1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1944,7 +1944,7 @@ vput(vp) } v_incr_usecount(vp, -1); vp->v_iflag |= VI_OWEINACT; - if (VOP_ISLOCKED(vp, td) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(vp, NULL) != LK_EXCLUSIVE) { error = VOP_LOCK(vp, LK_EXCLUPGRADE|LK_INTERLOCK|LK_NOWAIT, td); VI_LOCK(vp); if (error) @@ -3336,25 +3336,15 @@ void vop_lookup_post(void *ap, int rc) { struct vop_lookup_args *a; - struct componentname *cnp; struct vnode *dvp; struct vnode *vp; - int flags; a = ap; dvp = a->a_dvp; - cnp = a->a_cnp; vp = *(a->a_vpp); - flags = cnp->cn_flags; ASSERT_VI_UNLOCKED(dvp, "VOP_LOOKUP"); - - if (rc) - ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP (error)"); - else if (flags & ISDOTDOT) - ASSERT_VOP_UNLOCKED(dvp, "VOP_LOOKUP (ISDOTDOT)"); - else - ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP"); + ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP"); if (!rc) ASSERT_VOP_LOCKED(vp, "VOP_LOOKUP (child)"); |
