summaryrefslogtreecommitdiff
path: root/sys/ufs/ffs/ffs_vfsops.c
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2018-04-28 03:13:06 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2018-04-28 03:13:06 +0000
commit356327a519a213c5d0b435c6d4488b3c5f0b3efc (patch)
tree446ed191773422bb8b098be33ad3b13d10a3c43e /sys/ufs/ffs/ffs_vfsops.c
parentd8f64152dfaaddf25de9dca020b84c322b874855 (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/ufs/ffs/ffs_vfsops.c')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 50fc5ef6e59..2800d995412 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vfsops.c,v 1.174 2018/03/30 17:35:20 dhill Exp $ */
+/* $OpenBSD: ffs_vfsops.c,v 1.175 2018/04/28 03:13:05 visa Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */
/*
@@ -564,7 +564,7 @@ ffs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
devvp = VFSTOUFS(mountp)->um_devvp;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
error = vinvalbuf(devvp, 0, cred, p, 0, 0);
- VOP_UNLOCK(devvp, p);
+ VOP_UNLOCK(devvp);
if (error)
panic("ffs_reload: dirty1");
@@ -710,7 +710,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
return (EBUSY);
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
error = vinvalbuf(devvp, V_SAVE, cred, p, 0, 0);
- VOP_UNLOCK(devvp, p);
+ VOP_UNLOCK(devvp);
if (error)
return (error);
@@ -933,7 +933,7 @@ out:
vn_lock(devvp, LK_EXCLUSIVE|LK_RETRY, p);
(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
- VOP_UNLOCK(devvp, p);
+ VOP_UNLOCK(devvp);
if (ump) {
free(ump->um_fs, M_UFSMNT, ump->um_fs->fs_sbsize);
@@ -1098,7 +1098,7 @@ ffs_flushfiles(struct mount *mp, int flags, struct proc *p)
*/
vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_FSYNC(ump->um_devvp, p->p_ucred, MNT_WAIT, p);
- VOP_UNLOCK(ump->um_devvp, p);
+ VOP_UNLOCK(ump->um_devvp);
return (error);
}
@@ -1186,7 +1186,7 @@ ffs_sync_vnode(struct vnode *vp, void *arg)
if ((error = VOP_FSYNC(vp, fsa->cred, fsa->waitfor, fsa->p)))
fsa->allerror = error;
- VOP_UNLOCK(vp, fsa->p);
+ VOP_UNLOCK(vp);
vrele(vp);
end:
@@ -1252,7 +1252,7 @@ ffs_sync(struct mount *mp, int waitfor, int stall, struct ucred *cred, struct pr
vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY, p);
if ((error = VOP_FSYNC(ump->um_devvp, cred, waitfor, p)) != 0)
allerror = error;
- VOP_UNLOCK(ump->um_devvp, p);
+ VOP_UNLOCK(ump->um_devvp);
}
qsync(mp);
/*