diff options
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 13 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_lookup.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vnops.c | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 6fb53cb2f22..03a5677a05d 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.65 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.66 2018/05/02 02:24:56 visa Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -123,7 +123,6 @@ fifo_open(void *v) struct vop_open_args *ap = v; struct vnode *vp = ap->a_vp; struct fifoinfo *fip; - struct proc *p = ap->a_p; struct socket *rso, *wso; int s, error; @@ -186,7 +185,7 @@ fifo_open(void *v) VOP_UNLOCK(vp); error = tsleep(&fip->fi_readers, PCATCH | PSOCK, "fifor", 0); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (error) goto bad; } @@ -194,7 +193,7 @@ fifo_open(void *v) VOP_UNLOCK(vp); error = tsleep(&fip->fi_writers, PCATCH | PSOCK, "fifow", 0); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (error) goto bad; } @@ -215,7 +214,6 @@ fifo_read(void *v) struct vop_read_args *ap = v; struct uio *uio = ap->a_uio; struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock; - struct proc *p = uio->uio_procp; int error; #ifdef DIAGNOSTIC @@ -228,7 +226,7 @@ fifo_read(void *v) rso->so_state |= SS_NBIO; VOP_UNLOCK(ap->a_vp); error = soreceive(rso, NULL, uio, NULL, NULL, NULL, 0); - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); if (ap->a_ioflag & IO_NDELAY) { rso->so_state &= ~SS_NBIO; if (error == EWOULDBLOCK && @@ -247,7 +245,6 @@ fifo_write(void *v) { struct vop_write_args *ap = v; struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock; - struct proc *p = ap->a_uio->uio_procp; int error; #ifdef DIAGNOSTIC @@ -259,7 +256,7 @@ fifo_write(void *v) wso->so_state |= SS_NBIO; VOP_UNLOCK(ap->a_vp); error = sosend(wso, NULL, ap->a_uio, NULL, NULL, 0); - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); if (ap->a_ioflag & IO_NDELAY) wso->so_state &= ~SS_NBIO; return (error); diff --git a/sys/miscfs/fuse/fuse_lookup.c b/sys/miscfs/fuse/fuse_lookup.c index 5bc23fc63d1..e95ff4eefd6 100644 --- a/sys/miscfs/fuse/fuse_lookup.c +++ b/sys/miscfs/fuse/fuse_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_lookup.c,v 1.18 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: fuse_lookup.c,v 1.19 2018/05/02 02:24:56 visa Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -155,7 +155,7 @@ fusefs_lookup(void *v) error = VFS_VGET(fmp->mp, nid, &tdp); if (error) { - if (vn_lock(vdp, LK_EXCLUSIVE | LK_RETRY, p) == 0) + if (vn_lock(vdp, LK_EXCLUSIVE | LK_RETRY) == 0) cnp->cn_flags &= ~PDIRUNLOCK; goto reclaim; @@ -164,7 +164,7 @@ fusefs_lookup(void *v) tdp->v_type = nvtype; if (lockparent && (flags & ISLASTCN)) { - if ((error = vn_lock(vdp, LK_EXCLUSIVE, p))) { + if ((error = vn_lock(vdp, LK_EXCLUSIVE))) { vput(tdp); return (error); } diff --git a/sys/miscfs/fuse/fuse_vnops.c b/sys/miscfs/fuse/fuse_vnops.c index cecbac68760..eff3be0829b 100644 --- a/sys/miscfs/fuse/fuse_vnops.c +++ b/sys/miscfs/fuse/fuse_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vnops.c,v 1.38 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: fuse_vnops.c,v 1.39 2018/05/02 02:24:56 visa Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -573,7 +573,7 @@ fusefs_link(void *v) error = EXDEV; goto out2; } - if (dvp != vp && (error = vn_lock(vp, LK_EXCLUSIVE, p))) { + if (dvp != vp && (error = vn_lock(vp, LK_EXCLUSIVE))) { VOP_ABORTOP(dvp, cnp); goto out2; } @@ -1191,7 +1191,7 @@ abortit: goto abortit; } - if ((error = vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, p)) != 0) + if ((error = vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY)) != 0) goto abortit; dp = VTOI(fdvp); ip = VTOI(fvp); |