diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2018-04-28 03:13:06 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2018-04-28 03:13:06 +0000 |
| commit | 356327a519a213c5d0b435c6d4488b3c5f0b3efc (patch) | |
| tree | 446ed191773422bb8b098be33ad3b13d10a3c43e /sys/dev | |
| parent | d8f64152dfaaddf25de9dca020b84c322b874855 (diff) | |
Clean up the parameters of VOP_LOCK() and VOP_UNLOCK(). It is always
curproc that does the locking or unlocking, so the proc parameter
is pointless and can be dropped.
OK mpi@, deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/diskmap.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/uvideo.c | 4 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c index a14f03d4689..a61644f7810 100644 --- a/sys/dev/diskmap.c +++ b/sys/dev/diskmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskmap.c,v 1.17 2018/01/02 06:38:45 guenther Exp $ */ +/* $OpenBSD: diskmap.c,v 1.18 2018/04/28 03:13:04 visa Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> @@ -114,7 +114,7 @@ diskmapioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) fp->f_rbytes = 0; fp->f_wbytes = 0; - VOP_UNLOCK(vp, p); + VOP_UNLOCK(vp); FRELE(fp, p); fdpunlock(fdp); diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 3711ee24949..56856a9d8d2 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.197 2018/04/24 17:22:33 landry Exp $ */ +/* $OpenBSD: uvideo.c,v 1.198 2018/04/28 03:13:04 visa Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -2741,7 +2741,7 @@ uvideo_debug_file_open(struct uvideo_softc *sc) } sc->sc_vp = nd.ni_vp; - VOP_UNLOCK(sc->sc_vp, p); + VOP_UNLOCK(sc->sc_vp); if (nd.ni_vp->v_type != VREG) { vn_close(nd.ni_vp, FWRITE, p->p_ucred, p); return (EIO); diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index d9559ddda91..c7ecc9be87e 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnd.c,v 1.167 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: vnd.c,v 1.168 2018/04/28 03:13:04 visa Exp $ */ /* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */ /* @@ -461,14 +461,14 @@ vndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) else { error = VOP_GETATTR(nd.ni_vp, &vattr, p->p_ucred, p); if (error) { - VOP_UNLOCK(nd.ni_vp, p); + VOP_UNLOCK(nd.ni_vp); vn_close(nd.ni_vp, VNDRW(sc), p->p_ucred, p); disk_unlock(&sc->sc_dk); return (error); } sc->sc_size = vattr.va_size / sc->sc_secsize; } - VOP_UNLOCK(nd.ni_vp, p); + VOP_UNLOCK(nd.ni_vp); sc->sc_vp = nd.ni_vp; if ((error = vndsetcred(sc, p->p_ucred)) != 0) { (void) vn_close(nd.ni_vp, VNDRW(sc), p->p_ucred, p); |