diff options
| author | natano <natano@cvs.openbsd.org> | 2016-03-19 12:04:17 +0000 |
|---|---|---|
| committer | natano <natano@cvs.openbsd.org> | 2016-03-19 12:04:17 +0000 |
| commit | a9bad0de99cbc0922b684917f300008ad4b7f821 (patch) | |
| tree | 9bbf0a65b8ad489ea32bb54265c084bd2efd6f50 /sys/isofs/udf | |
| parent | d16c6aa7a075ad00ce2bccb0a5b52b930477d6ac (diff) | |
Remove the unused flags argument from VOP_UNLOCK().
torture tested on amd64, i386 and macppc
ok beck mpi stefan
"the change looks right" deraadt
Diffstat (limited to 'sys/isofs/udf')
| -rw-r--r-- | sys/isofs/udf/udf_vfsops.c | 10 | ||||
| -rw-r--r-- | sys/isofs/udf/udf_vnops.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c index 709b7ba327c..88a4dd3d7ee 100644 --- a/sys/isofs/udf/udf_vfsops.c +++ b/sys/isofs/udf/udf_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vfsops.c,v 1.47 2016/03/17 18:52:31 bluhm Exp $ */ +/* $OpenBSD: udf_vfsops.c,v 1.48 2016/03/19 12:04:15 natano Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -171,7 +171,7 @@ udf_mount(struct mount *mp, const char *path, void *data, if (p->p_ucred->cr_uid) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); error = VOP_ACCESS(devvp, VREAD, p->p_ucred, p); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); if (error) { vrele(devvp); return (error); @@ -251,7 +251,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, uint32_t lb, struct proc *p) return (EBUSY); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); error = vinvalbuf(devvp, V_SAVE, p->p_ucred, p, 0, 0); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); if (error) return (error); @@ -453,7 +453,7 @@ bail: vn_lock(devvp, LK_EXCLUSIVE|LK_RETRY, p); VOP_CLOSE(devvp, FREAD, FSCRED, p); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); return (error); } @@ -477,7 +477,7 @@ udf_unmount(struct mount *mp, int mntflags, struct proc *p) vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); vinvalbuf(devvp, V_SAVE, NOCRED, p, 0, 0); error = VOP_CLOSE(devvp, FREAD, NOCRED, p); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); if (error) return (error); diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index 7ac54416910..926ec8bd792 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.62 2016/02/02 16:44:44 stefan Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.63 2016/03/19 12:04:15 natano Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -911,7 +911,7 @@ udf_unlock(void *v) struct vnode *vp = ap->a_vp; - return (lockmgr(&VTOU(vp)->u_lock, ap->a_flags | LK_RELEASE, NULL)); + return (lockmgr(&VTOU(vp)->u_lock, LK_RELEASE, NULL)); } int @@ -1105,7 +1105,7 @@ lookloop: nchstats.ncs_pass2++; if (!(flags & LOCKPARENT) || !(flags & ISLASTCN)) { ap->a_cnp->cn_flags |= PDIRUNLOCK; - VOP_UNLOCK(dvp, 0, p); + VOP_UNLOCK(dvp, p); } *vpp = tdp; @@ -1152,7 +1152,7 @@ udf_inactive(void *v) /* * No need to sync anything, so just unlock the vnode and return. */ - VOP_UNLOCK(vp, 0, p); + VOP_UNLOCK(vp, p); return (0); } |