diff options
Diffstat (limited to 'sys/fs/nullfs')
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 9f1caf8..e2e48dd 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -108,7 +108,7 @@ nullfs_mount(struct mount *mp, struct thread *td) */ if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) && VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { - VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); + VOP_UNLOCK(mp->mnt_vnodecovered, 0); isvnunlocked = 1; } /* @@ -158,7 +158,7 @@ nullfs_mount(struct mount *mp, struct thread *td) * Make sure the node alias worked */ if (error) { - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); vrele(lowerrootvp); free(xmp, M_NULLFSMNT); /* XXX */ return (error); @@ -175,7 +175,7 @@ nullfs_mount(struct mount *mp, struct thread *td) /* * Unlock the node (either the lower or the alias) */ - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if (NULLVPTOLOWERVP(nullm_rootvp)->v_mount->mnt_flag & MNT_LOCAL) { MNT_ILOCK(mp); diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 66ccc7f..cdc45b7 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -296,7 +296,7 @@ null_bypass(struct vop_generic_args *ap) *(vps_p[i]) = old_vps[i]; #if 0 if (reles & VDESC_VP0_WILLUNLOCK) - VOP_UNLOCK(*(vps_p[i]), 0, curthread); + VOP_UNLOCK(*(vps_p[i]), 0); #endif if (reles & VDESC_VP0_WILLRELE) vrele(*(vps_p[i])); @@ -513,7 +513,6 @@ null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; - struct thread *td = ap->a_td; struct null_node *nn; struct vnode *lvp; int error; @@ -544,7 +543,7 @@ null_lock(struct vop_lock1_args *ap) * here. */ vholdl(lvp); - error = VOP_LOCK(lvp, flags, td); + error = VOP_LOCK(lvp, flags); /* * We might have slept to get the lock and someone might have @@ -566,7 +565,7 @@ null_lock(struct vop_lock1_args *ap) panic("Unsupported lock request %d\n", ap->a_flags); } - VOP_UNLOCK(lvp, 0, td); + VOP_UNLOCK(lvp, 0); error = vop_stdlock(ap); } vdrop(lvp); @@ -587,7 +586,6 @@ null_unlock(struct vop_unlock_args *ap) struct vnode *vp = ap->a_vp; int flags = ap->a_flags; int mtxlkflag = 0; - struct thread *td = ap->a_td; struct null_node *nn; struct vnode *lvp; int error; @@ -604,7 +602,7 @@ null_unlock(struct vop_unlock_args *ap) flags |= LK_INTERLOCK; vholdl(lvp); VI_UNLOCK(vp); - error = VOP_UNLOCK(lvp, flags, td); + error = VOP_UNLOCK(lvp, flags); vdrop(lvp); if (mtxlkflag == 0) VI_LOCK(vp); |
