aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/nullfs
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-01-03 22:29:58 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-01-03 22:29:58 +0000
commitb249ce48ea5560afdcff57e72a9880b7d3132434 (patch)
treeaf24958629e49de8db56734a7389a612627230d5 /sys/fs/nullfs
parent4a20fe31c373d6a6c81bd6205d210bd893dc8068 (diff)
downloadsrc-b249ce48ea5560afdcff57e72a9880b7d3132434.tar.gz
src-b249ce48ea5560afdcff57e72a9880b7d3132434.zip
vfs: drop the mostly unused flags argument from VOP_UNLOCK
Filesystems which want to use it in limited capacity can employ the VOP_UNLOCK_FLAGS macro. Reviewed by: kib (previous version) Differential Revision: https://reviews.freebsd.org/D21427
Notes
Notes: svn path=/head/; revision=356337
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r--sys/fs/nullfs/null_vfsops.c6
-rw-r--r--sys/fs/nullfs/null_vnops.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 352fa84c35b4..1ab8e8562fdc 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -113,7 +113,7 @@ nullfs_mount(struct mount *mp)
*/
if (mp->mnt_vnodecovered->v_op == &null_vnodeops &&
VOP_ISLOCKED(mp->mnt_vnodecovered) == LK_EXCLUSIVE) {
- VOP_UNLOCK(mp->mnt_vnodecovered, 0);
+ VOP_UNLOCK(mp->mnt_vnodecovered);
isvnunlocked = true;
} else {
isvnunlocked = false;
@@ -186,7 +186,7 @@ nullfs_mount(struct mount *mp)
/*
* Unlock the node (either the lower or the alias)
*/
- VOP_UNLOCK(vp, 0);
+ VOP_UNLOCK(vp);
if (NULLVPTOLOWERVP(nullm_rootvp)->v_mount->mnt_flag & MNT_LOCAL) {
MNT_ILOCK(mp);
@@ -444,7 +444,7 @@ nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp)
*/
KASSERT(VN_IS_DOOMED(vp),
("not reclaimed nullfs vnode %p", vp));
- VOP_UNLOCK(vp, 0);
+ VOP_UNLOCK(vp);
} else {
/*
* Otherwise, the nullfs vnode still shares the lock
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 84c32d4145a9..7ca56ce700b5 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -410,7 +410,7 @@ null_lookup(struct vop_lookup_args *ap)
* ldvp and locking dvp, which is also correct if the
* locks are still shared.
*/
- VOP_UNLOCK(ldvp, 0);
+ VOP_UNLOCK(ldvp);
vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
}
vdrop(ldvp);
@@ -690,7 +690,7 @@ null_lock(struct vop_lock1_args *ap)
panic("Unsupported lock request %d\n",
ap->a_flags);
}
- VOP_UNLOCK(lvp, 0);
+ VOP_UNLOCK(lvp);
error = vop_stdlock(ap);
}
vdrop(lvp);
@@ -718,7 +718,7 @@ null_unlock(struct vop_unlock_args *ap)
nn = VTONULL(vp);
if (nn != NULL && (lvp = NULLVPTOLOWERVP(vp)) != NULL) {
vholdnz(lvp);
- error = VOP_UNLOCK(lvp, 0);
+ error = VOP_UNLOCK(lvp);
vdrop(lvp);
} else {
error = vop_stdunlock(ap);
@@ -884,7 +884,7 @@ null_vptocnp(struct vop_vptocnp_args *ap)
vhold(lvp);
mp = vp->v_mount;
vfs_ref(mp);
- VOP_UNLOCK(vp, 0); /* vp is held by vn_vptocnp_locked that called us */
+ VOP_UNLOCK(vp); /* vp is held by vn_vptocnp_locked that called us */
ldvp = lvp;
vref(lvp);
error = vn_vptocnp(&ldvp, cred, ap->a_buf, ap->a_buflen);
@@ -907,7 +907,7 @@ null_vptocnp(struct vop_vptocnp_args *ap)
#ifdef DIAGNOSTIC
NULLVPTOLOWERVP(*dvp);
#endif
- VOP_UNLOCK(*dvp, 0); /* keep reference on *dvp */
+ VOP_UNLOCK(*dvp); /* keep reference on *dvp */
}
vn_lock(vp, locked | LK_RETRY);
vfs_rel(mp);