diff options
Diffstat (limited to 'sys/fs/nfsclient/nfs_clvnops.c')
-rw-r--r-- | sys/fs/nfsclient/nfs_clvnops.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index ad5a07ac910b..63b1ab76975b 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -353,7 +353,7 @@ nfs_lock(struct vop_lock1_args *ap) * sleepable call to vnode_pager_setsize(). */ NFSUNLOCKNODE(np); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (EBUSY); } if ((ap->a_flags & LK_NOWAIT) != 0 || @@ -363,7 +363,7 @@ nfs_lock(struct vop_lock1_args *ap) } if (lktype == LK_SHARED) { NFSUNLOCKNODE(np); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); ap->a_flags |= LK_EXCLUSIVE; error = VOP_LOCK1_APV(&default_vnodeops, ap); @@ -1358,7 +1358,7 @@ nfs_lookup(struct vop_lookup_args *ap) error = vfs_busy(mp, MBF_NOWAIT); if (error != 0) { vfs_ref(mp); - NFSVOPUNLOCK(dvp, 0); + NFSVOPUNLOCK(dvp); error = vfs_busy(mp, 0); NFSVOPLOCK(dvp, ltype | LK_RETRY); vfs_rel(mp); @@ -1369,7 +1369,7 @@ nfs_lookup(struct vop_lookup_args *ap) if (error != 0) return (error); } - NFSVOPUNLOCK(dvp, 0); + NFSVOPUNLOCK(dvp); error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, NULL, cnp->cn_lkflags); if (error == 0) @@ -1935,7 +1935,7 @@ nfs_rename(struct vop_rename_args *ap) * this condition can result in potential (silent) data loss. */ error = VOP_FSYNC(fvp, MNT_WAIT, fcnp->cn_thread); - NFSVOPUNLOCK(fvp, 0); + NFSVOPUNLOCK(fvp); if (!error && tvp) error = VOP_FSYNC(tvp, MNT_WAIT, tcnp->cn_thread); if (error) @@ -3185,7 +3185,7 @@ nfs_advlock(struct vop_advlock_args *ap) ap->a_fl, 0, cred, td, ap->a_id, ap->a_flags); if (ret == NFSERR_DENIED && (ap->a_flags & F_WAIT) && ap->a_op == F_SETLK) { - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); error = nfs_catnap(PZERO | PCATCH, ret, "ncladvl"); if (error) @@ -3239,13 +3239,13 @@ nfs_advlock(struct vop_advlock_args *ap) } else if (!NFS_ISV4(vp)) { if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) { size = VTONFS(vp)->n_size; - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); error = lf_advlock(ap, &(vp->v_lockf), size); } else { if (nfs_advlock_p != NULL) error = nfs_advlock_p(ap); else { - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); error = ENOLCK; } } @@ -3256,14 +3256,14 @@ nfs_advlock(struct vop_advlock_args *ap) NFSLOCKNODE(np); np->n_flag |= NHASBEENLOCKED; NFSUNLOCKNODE(np); - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); } } return (error); } else error = EOPNOTSUPP; out: - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); return (error); } @@ -3284,10 +3284,10 @@ nfs_advlockasync(struct vop_advlockasync_args *ap) return (error); if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) { size = VTONFS(vp)->n_size; - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); error = lf_advlockasync(ap, &(vp->v_lockf), size); } else { - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); error = EOPNOTSUPP; } return (error); @@ -3667,13 +3667,13 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) error = vn_lock(invp, LK_SHARED | LK_NOWAIT); if (error == 0) break; - VOP_UNLOCK(outvp, 0); + VOP_UNLOCK(outvp); if (mp != NULL) vn_finished_write(mp); mp = NULL; error = vn_lock(invp, LK_SHARED); if (error == 0) - VOP_UNLOCK(invp, 0); + VOP_UNLOCK(invp); } } if (mp != NULL) @@ -3802,8 +3802,8 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) error = 0; } } - VOP_UNLOCK(invp, 0); - VOP_UNLOCK(outvp, 0); + VOP_UNLOCK(invp); + VOP_UNLOCK(outvp); if (mp != NULL) vn_finished_write(mp); if (error == NFSERR_NOTSUPP || error == NFSERR_OFFLOADNOREQS || @@ -3893,7 +3893,7 @@ nfs_ioctl(struct vop_ioctl_args *ap) if (error == 0 && ret != 0) error = ret; } - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); if (error != 0) error = ENXIO; |