diff options
Diffstat (limited to 'sys/kern/vfs_lookup.c')
| -rw-r--r-- | sys/kern/vfs_lookup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 2d66aeff3a9..a8611b212cf 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lookup.c,v 1.59 2015/11/02 16:31:55 semarie Exp $ */ +/* $OpenBSD: vfs_lookup.c,v 1.60 2016/03/19 12:04:15 natano Exp $ */ /* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */ /* @@ -216,7 +216,7 @@ fail: return (0); } if ((cnp->cn_flags & LOCKPARENT) && (cnp->cn_flags & ISLASTCN)) - VOP_UNLOCK(ndp->ni_dvp, 0, p); + VOP_UNLOCK(ndp->ni_dvp, p); if (ndp->ni_loopcnt++ >= SYMLOOP_MAX) { error = ELOOP; break; @@ -547,7 +547,7 @@ dirloop: (cnp->cn_flags & NOCROSSMOUNT) == 0) { if (vfs_busy(mp, VB_READ|VB_WAIT)) continue; - VOP_UNLOCK(dp, 0, p); + VOP_UNLOCK(dp, p); error = VFS_ROOT(mp, &tdp); vfs_unbusy(mp); if (error) { @@ -614,13 +614,13 @@ terminal: vrele(ndp->ni_dvp); } if ((cnp->cn_flags & LOCKLEAF) == 0) - VOP_UNLOCK(dp, 0, p); + VOP_UNLOCK(dp, p); return (0); bad2: if ((cnp->cn_flags & LOCKPARENT) && (cnp->cn_flags & ISLASTCN) && ((cnp->cn_flags & PDIRUNLOCK) == 0)) - VOP_UNLOCK(ndp->ni_dvp, 0, p); + VOP_UNLOCK(ndp->ni_dvp, p); vrele(ndp->ni_dvp); bad: if (dpunlocked) @@ -748,12 +748,12 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) if (!wantparent) vrele(dvp); if ((cnp->cn_flags & LOCKLEAF) == 0) - VOP_UNLOCK(dp, 0, p); + VOP_UNLOCK(dp, p); return (0); bad2: if ((cnp->cn_flags & LOCKPARENT) && (cnp->cn_flags & ISLASTCN)) - VOP_UNLOCK(dvp, 0, p); + VOP_UNLOCK(dvp, p); vrele(dvp); bad: vput(dp); |