Author: mjg Date: Fri Jan 3 22:29:58 2020 New Revision: 356337 URL: https://svnweb.freebsd.org/changeset/base/356337
Log: 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 Modified: head/sys/cam/ctl/ctl_backend_block.c head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c head/sys/cddl/compat/opensolaris/sys/vnode.h head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/compat/cloudabi/cloudabi_file.c head/sys/compat/linux/linux_misc.c head/sys/compat/linuxkpi/common/src/linux_compat.c head/sys/compat/ndis/subr_ndis.c head/sys/dev/beri/virtio/virtio_block.c head/sys/dev/md/md.c head/sys/dev/veriexec/verified_exec.c head/sys/dev/xen/blkback/blkback.c head/sys/fs/autofs/autofs_vnops.c head/sys/fs/cd9660/cd9660_vfsops.c head/sys/fs/cd9660/cd9660_vnops.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/devfs/devfs_vfsops.c head/sys/fs/devfs/devfs_vnops.c head/sys/fs/ext2fs/ext2_vfsops.c head/sys/fs/ext2fs/ext2_vnops.c head/sys/fs/fdescfs/fdesc_vfsops.c head/sys/fs/fdescfs/fdesc_vnops.c head/sys/fs/fifofs/fifo_vnops.c head/sys/fs/fuse/fuse_vfsops.c head/sys/fs/msdosfs/msdosfs_vfsops.c head/sys/fs/msdosfs/msdosfs_vnops.c head/sys/fs/nfs/nfs_commonsubs.c head/sys/fs/nfs/nfsport.h head/sys/fs/nfsclient/nfs_clport.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/fs/nfsclient/nfs_clvnops.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/nfsserver/nfs_nfsdserv.c head/sys/fs/nfsserver/nfs_nfsdsocket.c head/sys/fs/nfsserver/nfs_nfsdstate.c head/sys/fs/nullfs/null_vfsops.c head/sys/fs/nullfs/null_vnops.c head/sys/fs/pseudofs/pseudofs_vncache.c head/sys/fs/pseudofs/pseudofs_vnops.c head/sys/fs/smbfs/smbfs_vfsops.c head/sys/fs/smbfs/smbfs_vnops.c head/sys/fs/tmpfs/tmpfs_vfsops.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/fs/udf/udf_vfsops.c head/sys/fs/unionfs/union_subr.c head/sys/fs/unionfs/union_vfsops.c head/sys/fs/unionfs/union_vnops.c head/sys/i386/linux/imgact_linux.c head/sys/kern/imgact_aout.c head/sys/kern/imgact_elf.c head/sys/kern/kern_acct.c head/sys/kern/kern_alq.c head/sys/kern/kern_ctf.c head/sys/kern/kern_descrip.c head/sys/kern/kern_exec.c head/sys/kern/kern_jail.c head/sys/kern/kern_ktrace.c head/sys/kern/kern_linker.c head/sys/kern/kern_proc.c head/sys/kern/kern_sendfile.c head/sys/kern/kern_shutdown.c head/sys/kern/kern_sig.c head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c head/sys/kern/uipc_mqueue.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_aio.c head/sys/kern/vfs_bio.c head/sys/kern/vfs_cache.c head/sys/kern/vfs_default.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_lookup.c head/sys/kern/vfs_mount.c head/sys/kern/vfs_mountroot.c head/sys/kern/vfs_subr.c head/sys/kern/vfs_syscalls.c head/sys/kern/vfs_vnops.c head/sys/kern/vnode_if.src head/sys/nfs/nfs_lock.c head/sys/nlm/nlm_advlock.c head/sys/nlm/nlm_prot_impl.c head/sys/security/audit/audit_arg.c head/sys/security/audit/audit_syscalls.c head/sys/security/audit/audit_worker.c head/sys/security/mac/mac_process.c head/sys/security/mac/mac_syscalls.c head/sys/security/mac_veriexec/mac_veriexec.c head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c head/sys/sys/param.h head/sys/sys/vnode.h head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_rawread.c head/sys/ufs/ffs/ffs_snapshot.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/ffs_suspend.c head/sys/ufs/ffs/ffs_vfsops.c head/sys/ufs/ufs/ufs_extattr.c head/sys/ufs/ufs/ufs_lookup.c head/sys/ufs/ufs/ufs_quota.c head/sys/ufs/ufs/ufs_vnops.c head/sys/vm/swap_pager.c head/sys/vm/vm_map.c head/sys/vm/vm_object.c head/sys/vm/vnode_pager.c Modified: head/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- head/sys/cam/ctl/ctl_backend_block.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cam/ctl/ctl_backend_block.c Fri Jan 3 22:29:58 2020 (r356337) @@ -592,7 +592,7 @@ ctl_be_block_flush_file(struct ctl_be_block_lun *be_lu vn_lock(be_lun->vn, lock_flags | LK_RETRY); error = VOP_FSYNC(be_lun->vn, beio->io_arg ? MNT_NOWAIT : MNT_WAIT, curthread); - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); vn_finished_write(mountpoint); @@ -685,7 +685,7 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be */ error = VOP_READ(be_lun->vn, &xuio, flags, file_data->cred); - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); SDT_PROBE0(cbb, , read, file_done); if (error == 0 && xuio.uio_resid > 0) { /* @@ -732,7 +732,7 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be * cache before returning. */ error = VOP_WRITE(be_lun->vn, &xuio, flags, file_data->cred); - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); vn_finished_write(mountpoint); SDT_PROBE0(cbb, , write, file_done); @@ -810,7 +810,7 @@ ctl_be_block_gls_file(struct ctl_be_block_lun *be_lun, off = be_lun->size_bytes; } } - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); data = (struct scsi_get_lba_status_data *)io->scsiio.kern_data_ptr; scsi_u64to8b(lbalen->lba, data->descr[0].addr); @@ -845,7 +845,7 @@ ctl_be_block_getattr_file(struct ctl_be_block_lun *be_ val = statfs.f_bavail * statfs.f_bsize / be_lun->cbe_lun.blocksize; } - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); return (val); } @@ -2188,7 +2188,7 @@ again: snprintf(req->error_str, sizeof(req->error_str), "%s is not a disk or plain file", be_lun->dev_path); } - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); if (error != 0) ctl_be_block_close(be_lun); @@ -2604,7 +2604,7 @@ ctl_be_block_modify(struct ctl_be_block_softc *softc, else if (be_lun->vn->v_type == VREG) { vn_lock(be_lun->vn, LK_SHARED | LK_RETRY); error = ctl_be_block_open_file(be_lun, req); - VOP_UNLOCK(be_lun->vn, 0); + VOP_UNLOCK(be_lun->vn); } else error = EINVAL; if ((cbe_lun->flags & CTL_LUN_FLAG_NO_MEDIA) && Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c ============================================================================== --- head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c Fri Jan 3 22:29:58 2020 (r356337) @@ -79,7 +79,7 @@ kobj_open_file_vnode(const char *file) return (NULL); NDFREE(&nd, NDF_ONLY_PNBUF); /* We just unlock so we hold a reference. */ - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); return (nd.ni_vp); } @@ -121,7 +121,7 @@ kobj_get_filesize_vnode(struct _buf *file, uint64_t *s vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_GETATTR(vp, &va, curthread->td_ucred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); if (error == 0) *size = (uint64_t)va.va_size; return (error); @@ -174,7 +174,7 @@ kobj_read_file_vnode(struct _buf *file, char *buf, uns vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (error != 0 ? -1 : size - auio.uio_resid); } Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c ============================================================================== --- head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c Fri Jan 3 22:29:58 2020 (r356337) @@ -53,7 +53,7 @@ lookupnameat(char *dirname, enum uio_seg seg, enum sym vref(startvp); ltype = VOP_ISLOCKED(startvp); - VOP_UNLOCK(startvp, 0); + VOP_UNLOCK(startvp); NDINIT_ATVP(&nd, LOOKUP, LOCKLEAF | follow, seg, dirname, startvp, curthread); error = namei(&nd); Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c ============================================================================== --- head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c Fri Jan 3 22:29:58 2020 (r356337) @@ -154,7 +154,7 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const cha vput(vp); return (error); } - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); /* * Allocate and initialize the filesystem. @@ -241,7 +241,7 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const cha vfs_event_signal(NULL, VQ_MOUNT, 0); if (VFS_ROOT(mp, LK_EXCLUSIVE, &mvp)) panic("mount: lost mount"); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vfs_op_exit(mp); vfs_unbusy(mp); *vpp = mvp; Modified: head/sys/cddl/compat/opensolaris/sys/vnode.h ============================================================================== --- head/sys/cddl/compat/opensolaris/sys/vnode.h Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/compat/opensolaris/sys/vnode.h Fri Jan 3 22:29:58 2020 (r356337) @@ -185,7 +185,7 @@ vn_openat(char *pnamep, enum uio_seg seg, int filemode NDFREE(&nd, NDF_ONLY_PNBUF); if (error == 0) { /* We just unlock so we hold a reference. */ - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); *vpp = nd.ni_vp; } return (error); @@ -241,7 +241,7 @@ zfs_vop_fsync(vnode_t *vp, int flag, cred_t *cr) goto drop; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_FSYNC(vp, MNT_WAIT, curthread); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_finished_write(mp); drop: return (error); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c Fri Jan 3 22:29:58 2020 (r356337) @@ -139,7 +139,7 @@ skip_open: vattr.va_mask = AT_SIZE; vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_GETATTR(vp, &vattr, kcred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); if (error) { (void) VOP_CLOSE(vp, spa_mode(vd->vdev_spa), 1, 0, kcred, NULL); vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Fri Jan 3 22:29:58 2020 (r356337) @@ -721,7 +721,7 @@ zfsctl_root_vptocnp(struct vop_vptocnp_args *ap) if (error != 0) return (SET_ERROR(error)); - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); *ap->a_vpp = dvp; *ap->a_buflen -= sizeof (dotzfs_name); bcopy(dotzfs_name, ap->a_buf + *ap->a_buflen, sizeof (dotzfs_name)); @@ -1233,7 +1233,7 @@ zfsctl_snapshot_vptocnp(struct vop_vptocnp_args *ap) /* Look up .zfs/snapshot, our parent. */ error = zfsctl_snapdir_vnode(vp->v_mount, NULL, LK_SHARED, &dvp); if (error == 0) { - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); *ap->a_vpp = dvp; *ap->a_buflen -= len; bcopy(node->sn_name, ap->a_buf + *ap->a_buflen, len); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c Fri Jan 3 22:29:58 2020 (r356337) @@ -923,7 +923,7 @@ top: goto top; } if (error == 0) - VOP_UNLOCK(*xvpp, 0); + VOP_UNLOCK(*xvpp); return (error); } Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c Fri Jan 3 22:29:58 2020 (r356337) @@ -546,7 +546,7 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t by default: error = SET_ERROR(ENOTSUP); } - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp)); out: if (error == 0 && vp != NULL) @@ -590,7 +590,7 @@ zfs_replay_remove(void *arg1, void *arg2, boolean_t by vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LOOKUP(ZTOV(dzp), &vp, &cn); if (error != 0) { - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp)); goto fail; } @@ -605,7 +605,7 @@ zfs_replay_remove(void *arg1, void *arg2, boolean_t by error = SET_ERROR(ENOTSUP); } vput(vp); - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp)); fail: VN_RELE(ZTOV(dzp)); @@ -646,8 +646,8 @@ zfs_replay_link(void *arg1, void *arg2, boolean_t byte vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LINK(ZTOV(dzp), ZTOV(zp), &cn /*,vflg*/); - VOP_UNLOCK(ZTOV(zp), 0); - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(zp)); + VOP_UNLOCK(ZTOV(dzp)); VN_RELE(ZTOV(zp)); VN_RELE(ZTOV(dzp)); @@ -693,10 +693,10 @@ zfs_replay_rename(void *arg1, void *arg2, boolean_t by scn.cn_thread = td; vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY); error = VOP_LOOKUP(ZTOV(sdzp), &svp, &scn); - VOP_UNLOCK(ZTOV(sdzp), 0); + VOP_UNLOCK(ZTOV(sdzp)); if (error != 0) goto fail; - VOP_UNLOCK(svp, 0); + VOP_UNLOCK(svp); tcn.cn_nameptr = tname; tcn.cn_namelen = strlen(tname); @@ -710,7 +710,7 @@ zfs_replay_rename(void *arg1, void *arg2, boolean_t by if (error == EJUSTRETURN) tvp = NULL; else if (error != 0) { - VOP_UNLOCK(ZTOV(tdzp), 0); + VOP_UNLOCK(ZTOV(tdzp)); goto fail; } @@ -925,7 +925,7 @@ zfs_replay_setattr(void *arg1, void *arg2, boolean_t b vp = ZTOV(zp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_SETATTR(vp, vap, kcred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); zfs_fuid_info_free(zfsvfs->z_fuid_replay); zfsvfs->z_fuid_replay = NULL; @@ -966,7 +966,7 @@ zfs_replay_acl_v0(void *arg1, void *arg2, boolean_t by vp = ZTOV(zp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = zfs_setsecattr(vp, &vsa, 0, kcred, NULL); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); VN_RELE(vp); @@ -1030,7 +1030,7 @@ zfs_replay_acl(void *arg1, void *arg2, boolean_t bytes vp = ZTOV(zp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = zfs_setsecattr(vp, &vsa, 0, kcred, NULL); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); if (zfsvfs->z_fuid_replay) zfs_fuid_info_free(zfsvfs->z_fuid_replay); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c Fri Jan 3 22:29:58 2020 (r356337) @@ -305,7 +305,7 @@ zfs_sa_upgrade(sa_handle_t *hdl, dmu_tx_t *tx) zp->z_is_sa = B_TRUE; done: - VOP_UNLOCK(ZTOV(zp), 0); + VOP_UNLOCK(ZTOV(zp)); } void Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -1855,16 +1855,16 @@ zfs_mount(vfs_t *vfsp) vn_lock(mvp, LK_SHARED | LK_RETRY); if (VOP_GETATTR(mvp, &vattr, cr)) { - VOP_UNLOCK(mvp, 0); + VOP_UNLOCK(mvp); goto out; } if (secpolicy_vnode_owner(mvp, cr, vattr.va_uid) != 0 && VOP_ACCESS(mvp, VWRITE, cr, td) != 0) { - VOP_UNLOCK(mvp, 0); + VOP_UNLOCK(mvp); goto out; } - VOP_UNLOCK(mvp, 0); + VOP_UNLOCK(mvp); } secpolicy_fs_mount_clearopts(cr, vfsp); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -1569,7 +1569,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, stru ZFS_EXIT(zfsvfs); ltype = VOP_ISLOCKED(dvp); - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); error = zfsctl_root(zfsvfs->z_parent, LK_SHARED, &zfsctl_vp); if (error == 0) { @@ -3455,9 +3455,9 @@ zfs_rename_relock(struct vnode *sdvp, struct vnode **s const char *tnm = tcnp->cn_nameptr; int error; - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(tdvp); if (*tvpp != NULL && *tvpp != tdvp) - VOP_UNLOCK(*tvpp, 0); + VOP_UNLOCK(*tvpp); relock: error = vn_lock(sdvp, LK_EXCLUSIVE); @@ -3467,13 +3467,13 @@ relock: error = vn_lock(tdvp, LK_EXCLUSIVE | LK_NOWAIT); if (error != 0) { - VOP_UNLOCK(sdvp, 0); + VOP_UNLOCK(sdvp); if (error != EBUSY) goto out; error = vn_lock(tdvp, LK_EXCLUSIVE); if (error) goto out; - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(tdvp); goto relock; } tdzp = VTOZ(tdvp); @@ -3499,8 +3499,8 @@ relock: */ if (tdzp->z_sa_hdl == NULL || sdzp->z_sa_hdl == NULL) { ZFS_EXIT(zfsvfs); - VOP_UNLOCK(sdvp, 0); - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(sdvp); + VOP_UNLOCK(tdvp); error = SET_ERROR(EIO); goto out; } @@ -3513,8 +3513,8 @@ relock: if (error != 0) { /* Source entry invalid or not there. */ ZFS_EXIT(zfsvfs); - VOP_UNLOCK(sdvp, 0); - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(sdvp); + VOP_UNLOCK(tdvp); if ((scnp->cn_flags & ISDOTDOT) != 0 || (scnp->cn_namelen == 1 && scnp->cn_nameptr[0] == '.')) error = SET_ERROR(EINVAL); @@ -3528,8 +3528,8 @@ relock: error = zfs_dirent_lookup(tdzp, tnm, &tzp, 0); if (error != 0) { ZFS_EXIT(zfsvfs); - VOP_UNLOCK(sdvp, 0); - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(sdvp); + VOP_UNLOCK(tdvp); vrele(svp); if ((tcnp->cn_flags & ISDOTDOT) != 0) error = SET_ERROR(EINVAL); @@ -3552,8 +3552,8 @@ relock: nvp = svp; error = vn_lock(nvp, LK_EXCLUSIVE | LK_NOWAIT); if (error != 0) { - VOP_UNLOCK(sdvp, 0); - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(sdvp); + VOP_UNLOCK(tdvp); if (tvp != NULL) vrele(tvp); if (error != EBUSY) { @@ -3565,7 +3565,7 @@ relock: vrele(nvp); goto out; } - VOP_UNLOCK(nvp, 0); + VOP_UNLOCK(nvp); /* * Concurrent rename race. * XXX ? @@ -3589,9 +3589,9 @@ relock: nvp = tvp; error = vn_lock(nvp, LK_EXCLUSIVE | LK_NOWAIT); if (error != 0) { - VOP_UNLOCK(sdvp, 0); - VOP_UNLOCK(tdvp, 0); - VOP_UNLOCK(*svpp, 0); + VOP_UNLOCK(sdvp); + VOP_UNLOCK(tdvp); + VOP_UNLOCK(*svpp); if (error != EBUSY) { vrele(nvp); goto out; @@ -3913,17 +3913,17 @@ zfs_rename(vnode_t *sdvp, vnode_t **svpp, struct compo unlockout: /* all 4 vnodes are locked, ZFS_ENTER called */ ZFS_EXIT(zfsvfs); - VOP_UNLOCK(*svpp, 0); - VOP_UNLOCK(sdvp, 0); + VOP_UNLOCK(*svpp); + VOP_UNLOCK(sdvp); out: /* original two vnodes are locked */ if (error == 0 && zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS) zil_commit(zilog, 0); if (*tvpp != NULL) - VOP_UNLOCK(*tvpp, 0); + VOP_UNLOCK(*tvpp); if (tdvp != *tvpp) - VOP_UNLOCK(tdvp, 0); + VOP_UNLOCK(tdvp); return (error); } @@ -5505,7 +5505,7 @@ vop_getextattr { } else if (ap->a_uio != NULL) error = VOP_READ(vp, ap->a_uio, IO_UNIT, ap->a_cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_close(vp, flags, ap->a_cred, td); ZFS_EXIT(zfsvfs); @@ -5640,7 +5640,7 @@ vop_setextattr { if (error == 0) VOP_WRITE(vp, ap->a_uio, IO_UNIT, ap->a_cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_close(vp, flags, ap->a_cred, td); ZFS_EXIT(zfsvfs); @@ -5903,7 +5903,7 @@ zfs_vptocnp(struct vop_vptocnp_args *ap) covered_vp = vp->v_mount->mnt_vnodecovered; vs = vget_prep(covered_vp); ltype = VOP_ISLOCKED(vp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); error = vget_finish(covered_vp, LK_SHARED, vs); if (error == 0) { error = VOP_VPTOCNP(covered_vp, ap->a_vpp, ap->a_cred, Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Fri Jan 3 22:29:58 2020 (r356337) @@ -1272,7 +1272,7 @@ again: err = insmntque(vp, zfsvfs->z_vfs); if (err == 0) { vp->v_hash = obj_num; - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); } else { zp->z_vnode = NULL; zfs_znode_dmu_fini(zp); Modified: head/sys/compat/cloudabi/cloudabi_file.c ============================================================================== --- head/sys/compat/cloudabi/cloudabi_file.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/compat/cloudabi/cloudabi_file.c Fri Jan 3 22:29:58 2020 (r356337) @@ -291,7 +291,7 @@ cloudabi_sys_file_open(struct thread *td, finit(fp, (fflags & FMASK) | (fp->f_flag & FHASLOCK), DTYPE_VNODE, vp, &vnops); } - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); /* Truncate file. */ if (fflags & O_TRUNC) { @@ -434,14 +434,14 @@ cloudabi_sys_file_readdir(struct thread *td, /* Validate file type. */ vn_lock(vp, LK_SHARED | LK_RETRY); if (vp->v_type != VDIR) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); error = ENOTDIR; goto done; } #ifdef MAC error = mac_vnode_check_readdir(td->td_ucred, vp); if (error != 0) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); goto done; } #endif /* MAC */ @@ -451,7 +451,7 @@ cloudabi_sys_file_readdir(struct thread *td, ncookies = 0; error = VOP_READDIR(vp, &readuio, fp->f_cred, &eof, &ncookies, &cookies); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); if (error != 0) goto done; Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/compat/linux/linux_misc.c Fri Jan 3 22:29:58 2020 (r356337) @@ -396,7 +396,7 @@ linux_uselib(struct thread *td, struct linux_uselib_ar * Lock no longer needed */ locked = false; - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); /* * Check if file_offset page aligned. Currently we cannot handle @@ -469,7 +469,7 @@ linux_uselib(struct thread *td, struct linux_uselib_ar cleanup: if (opened) { if (locked) - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); locked = false; VOP_CLOSE(vp, FREAD, td->td_ucred, td); } @@ -481,7 +481,7 @@ cleanup: VOP_UNSET_TEXT_CHECKED(vp); } if (locked) - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); /* Release the temporary mapping. */ if (a_out) Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Jan 3 22:29:58 2020 (r356337) @@ -1663,7 +1663,7 @@ linux_file_stat(struct file *fp, struct stat *sb, stru vn_lock(vp, LK_SHARED | LK_RETRY); error = vn_stat(vp, sb, td->td_ucred, NOCRED, td); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (error); } Modified: head/sys/compat/ndis/subr_ndis.c ============================================================================== --- head/sys/compat/ndis/subr_ndis.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/compat/ndis/subr_ndis.c Fri Jan 3 22:29:58 2020 (r356337) @@ -2845,7 +2845,7 @@ NdisOpenFile(status, filehandle, filelength, filename, /* Get the file size. */ VOP_GETATTR(nd.ni_vp, vap, td->td_ucred); - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); fh->nf_vp = nd.ni_vp; fh->nf_map = NULL; Modified: head/sys/dev/beri/virtio/virtio_block.c ============================================================================== --- head/sys/dev/beri/virtio/virtio_block.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/dev/beri/virtio/virtio_block.c Fri Jan 3 22:29:58 2020 (r356337) @@ -133,12 +133,12 @@ vtblk_rdwr(struct beri_vtblk_softc *sc, struct iovec * if (operation == 0) { vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_READ(vp, &auio, IO_DIRECT, sc->cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); } else { (void) vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_WRITE(vp, &auio, IO_SYNC, sc->cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_finished_write(mp); } @@ -218,7 +218,7 @@ close_file(struct beri_vtblk_softc *sc, struct thread if (sc->vnode != NULL) { vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY); sc->vnode->v_vflag &= ~VV_MD; - VOP_UNLOCK(sc->vnode, 0); + VOP_UNLOCK(sc->vnode); error = vn_close(sc->vnode, (FREAD|FWRITE), sc->cred, td); if (error != 0) @@ -263,7 +263,7 @@ open_file(struct beri_vtblk_softc *sc, struct thread * } } nd.ni_vp->v_vflag |= VV_MD; - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); sc->vnode = nd.ni_vp; sc->cred = crhold(td->td_ucred); Modified: head/sys/dev/md/md.c ============================================================================== --- head/sys/dev/md/md.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/dev/md/md.c Fri Jan 3 22:29:58 2020 (r356337) @@ -915,7 +915,7 @@ mdstart_vnode(struct md_s *sc, struct bio *bp) (void) vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_FSYNC(vp, MNT_WAIT, td); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_finished_write(mp); return (error); } @@ -986,13 +986,13 @@ unmapped_step: if (auio.uio_rw == UIO_READ) { vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_READ(vp, &auio, 0, sc->cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); } else { (void) vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_WRITE(vp, &auio, sc->flags & MD_ASYNC ? 0 : IO_SYNC, sc->cred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_finished_write(mp); if (error == 0) sc->flags &= ~MD_VERIFY; @@ -1405,7 +1405,7 @@ mdsetcred(struct md_s *sc, struct ucred *cred) auio.uio_resid = aiov.iov_len; vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY); error = VOP_READ(sc->vnode, &auio, 0, sc->cred); - VOP_UNLOCK(sc->vnode, 0); + VOP_UNLOCK(sc->vnode); free(tmpbuf, M_TEMP); } return (error); @@ -1456,7 +1456,7 @@ mdcreate_vnode(struct md_s *sc, struct md_req *mdr, st } } nd.ni_vp->v_vflag |= VV_MD; - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); if (mdr->md_fwsectors != 0) sc->fwsectors = mdr->md_fwsectors; @@ -1479,7 +1479,7 @@ mdcreate_vnode(struct md_s *sc, struct md_req *mdr, st } return (0); bad: - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp); (void)vn_close(nd.ni_vp, flags, td->td_ucred, td); return (error); } @@ -1523,7 +1523,7 @@ mddestroy(struct md_s *sc, struct thread *td) if (sc->vnode != NULL) { vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY); sc->vnode->v_vflag &= ~VV_MD; - VOP_UNLOCK(sc->vnode, 0); + VOP_UNLOCK(sc->vnode); (void)vn_close(sc->vnode, sc->flags & MD_READONLY ? FREAD : (FREAD|FWRITE), sc->cred, td); } Modified: head/sys/dev/veriexec/verified_exec.c ============================================================================== --- head/sys/dev/veriexec/verified_exec.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/dev/veriexec/verified_exec.c Fri Jan 3 22:29:58 2020 (r356337) @@ -205,7 +205,7 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm if (error != 0) { mac_veriexec_set_fingerprint_status(nid.ni_vp, FINGERPRINT_INVALID); - VOP_UNLOCK(nid.ni_vp, 0); + VOP_UNLOCK(nid.ni_vp); (void) vn_close(nid.ni_vp, FREAD, td->td_ucred, td); return (error); @@ -227,7 +227,7 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm */ mac_veriexec_set_fingerprint_status(nid.ni_vp, FINGERPRINT_INVALID); - VOP_UNLOCK(nid.ni_vp, 0); + VOP_UNLOCK(nid.ni_vp); (void) vn_close(nid.ni_vp, FREAD, td->td_ucred, td); if (params->flags & VERIEXEC_LABEL) labellen = strnlen(lparams->label, Modified: head/sys/dev/xen/blkback/blkback.c ============================================================================== --- head/sys/dev/xen/blkback/blkback.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/dev/xen/blkback/blkback.c Fri Jan 3 22:29:58 2020 (r356337) @@ -2282,7 +2282,7 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe vn_lock(xbb->vn, LK_EXCLUSIVE | LK_RETRY); error = VOP_FSYNC(xbb->vn, MNT_WAIT, curthread); - VOP_UNLOCK(xbb->vn, 0); + VOP_UNLOCK(xbb->vn); vn_finished_write(mountpoint); @@ -2401,7 +2401,7 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe error = VOP_READ(xbb->vn, &xuio, (flags & BIO_ORDERED) ? (IO_DIRECT|IO_SYNC) : 0, file_data->cred); - VOP_UNLOCK(xbb->vn, 0); + VOP_UNLOCK(xbb->vn); break; case BIO_WRITE: { struct mount *mountpoint; @@ -2434,7 +2434,7 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe */ error = VOP_WRITE(xbb->vn, &xuio, (flags & BIO_ORDERED) ? IO_SYNC : 0, file_data->cred); - VOP_UNLOCK(xbb->vn, 0); + VOP_UNLOCK(xbb->vn); vn_finished_write(mountpoint); @@ -2744,7 +2744,7 @@ xbb_open_backend(struct xbb_softc *xbb) xenbus_dev_fatal(xbb->dev, error, "%s is not a disk " "or file", xbb->dev_name); } - VOP_UNLOCK(xbb->vn, 0); + VOP_UNLOCK(xbb->vn); if (error != 0) { xbb_close_backend(xbb); Modified: head/sys/fs/autofs/autofs_vnops.c ============================================================================== --- head/sys/fs/autofs/autofs_vnops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/autofs/autofs_vnops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -152,7 +152,7 @@ autofs_trigger_vn(struct vnode *vp, const char *path, */ lock_flags = VOP_ISLOCKED(vp); vref(vp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); sx_xlock(&autofs_softc->sc_lock); Modified: head/sys/fs/cd9660/cd9660_vfsops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vfsops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/cd9660/cd9660_vfsops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -235,7 +235,7 @@ iso_mountfs(devvp, mp) if (error == 0) g_getattr("MNT::verified", cp, &isverified); g_topology_unlock(); - VOP_UNLOCK(devvp, 0); + VOP_UNLOCK(devvp); if (error) goto out; if (devvp->v_rdev->si_iosize_max != 0) Modified: head/sys/fs/cd9660/cd9660_vnops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vnops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/cd9660/cd9660_vnops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -261,11 +261,11 @@ cd9660_ioctl(ap) vp = ap->a_vp; vn_lock(vp, LK_SHARED | LK_RETRY); if (VN_IS_DOOMED(vp)) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (EBADF); } if (vp->v_type == VCHR || vp->v_type == VBLK) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (EOPNOTSUPP); } @@ -281,7 +281,7 @@ cd9660_ioctl(ap) break; } - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (error); } Modified: head/sys/fs/devfs/devfs_devs.c ============================================================================== --- head/sys/fs/devfs/devfs_devs.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/devfs/devfs_devs.c Fri Jan 3 22:29:58 2020 (r356337) @@ -407,7 +407,7 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dire VI_UNLOCK(vp); vgone(vp); if ((flags & DEVFS_DEL_VNLOCKED) == 0) - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vdrop(vp); sx_xlock(&dm->dm_lock); } else Modified: head/sys/fs/devfs/devfs_vfsops.c ============================================================================== --- head/sys/fs/devfs/devfs_vfsops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/devfs/devfs_vfsops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -156,7 +156,7 @@ devfs_mount(struct mount *mp) sx_xunlock(&fmp->dm_lock); } - VOP_UNLOCK(rvp, 0); + VOP_UNLOCK(rvp); vfs_cache_root_set(mp, rvp); vfs_mountedfrom(mp, "devfs"); Modified: head/sys/fs/devfs/devfs_vnops.c ============================================================================== --- head/sys/fs/devfs/devfs_vnops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/devfs/devfs_vnops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -241,7 +241,7 @@ devfs_populate_vp(struct vnode *vp) DEVFS_DMP_HOLD(dmp); /* Can't call devfs_populate() with the vnode lock held. */ - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); devfs_populate(dmp); sx_xunlock(&dmp->dm_lock); @@ -635,7 +635,7 @@ devfs_close(struct vop_close_args *ap) vholdnz(vp); VI_UNLOCK(vp); vp_locked = VOP_ISLOCKED(vp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); KASSERT(dev->si_refcount > 0, ("devfs_close() on un-referenced struct cdev *(%s)", devtoname(dev))); error = dsw->d_close(dev, ap->a_fflag | dflags, S_IFCHR, td); @@ -965,7 +965,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlo if (de == NULL) return (ENOENT); dvplocked = VOP_ISLOCKED(dvp); - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); error = devfs_allocv(de, mp, cnp->cn_lkflags & LK_TYPE_MASK, vpp); *dm_unlock = 0; @@ -1153,7 +1153,7 @@ devfs_open(struct vop_open_args *ap) } vlocked = VOP_ISLOCKED(vp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); fpop = td->td_fpop; td->td_fpop = fp; @@ -1464,9 +1464,9 @@ devfs_remove(struct vop_remove_args *ap) de_covered->de_flags &= ~DE_COVERED; } /* We need to unlock dvp because devfs_delete() may lock it. */ - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); if (dvp != vp) - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); devfs_delete(dmp, de, 0); sx_xunlock(&dmp->dm_lock); if (dvp != vp) @@ -1507,7 +1507,7 @@ devfs_revoke(struct vop_revoke_args *ap) vgone(vp); vdrop(vp); - VOP_UNLOCK(vp,0); + VOP_UNLOCK(vp); loop: for (;;) { mtx_lock(&devfs_de_interlock); @@ -1563,12 +1563,12 @@ devfs_rioctl(struct vop_ioctl_args *ap) vp = ap->a_vp; vn_lock(vp, LK_SHARED | LK_RETRY); if (VN_IS_DOOMED(vp)) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); return (EBADF); } dmp = VFSTODEVFS(vp->v_mount); sx_xlock(&dmp->dm_lock); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); DEVFS_DMP_HOLD(dmp); devfs_populate(dmp); if (DEVFS_DMP_DROP(dmp)) { Modified: head/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vfsops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/ext2fs/ext2_vfsops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -197,10 +197,10 @@ ext2_mount(struct mount *mp) if (error) error = priv_check(td, PRIV_VFS_MOUNT_PERM); if (error) { - VOP_UNLOCK(devvp, 0); + VOP_UNLOCK(devvp); return (error); } - VOP_UNLOCK(devvp, 0); + VOP_UNLOCK(devvp); g_topology_lock(); error = g_access(ump->um_cp, 0, 1, 0); g_topology_unlock(); @@ -744,7 +744,7 @@ ext2_reload(struct mount *mp, struct thread *td) vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); if (vinvalbuf(devvp, 0, 0, 0) != 0) panic("ext2_reload: dirty1"); - VOP_UNLOCK(devvp, 0); + VOP_UNLOCK(devvp); /* * Step 2: re-read superblock from disk. @@ -802,7 +802,7 @@ loop: error = bread(devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)), (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vrele(vp); MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); return (error); @@ -812,7 +812,7 @@ loop: EXT2_INODE_SIZE(fs) * ino_to_fsbo(fs, ip->i_number)), ip); brelse(bp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vrele(vp); if (error) { @@ -849,7 +849,7 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp) g_topology_lock(); error = g_vfs_open(devvp, &cp, "ext2fs", ronly ? 0 : 1); g_topology_unlock(); - VOP_UNLOCK(devvp, 0); + VOP_UNLOCK(devvp); if (error) return (error); @@ -1155,7 +1155,7 @@ loop: } if ((error = VOP_FSYNC(vp, waitfor, td)) != 0) allerror = error; - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vrele(vp); } @@ -1166,7 +1166,7 @@ loop: vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY); if ((error = VOP_FSYNC(ump->um_devvp, waitfor, td)) != 0) allerror = error; - VOP_UNLOCK(ump->um_devvp, 0); + VOP_UNLOCK(ump->um_devvp); } /* Modified: head/sys/fs/ext2fs/ext2_vnops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vnops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/ext2fs/ext2_vnops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -837,13 +837,13 @@ abortit: ip = VTOI(fvp); if (ip->i_nlink >= EXT4_LINK_MAX && !EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs, EXT2F_ROCOMPAT_DIR_NLINK)) { - VOP_UNLOCK(fvp, 0); + VOP_UNLOCK(fvp); error = EMLINK; goto abortit; } if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) || (dp->i_flags & APPEND)) { - VOP_UNLOCK(fvp, 0); + VOP_UNLOCK(fvp); error = EPERM; goto abortit; } @@ -854,7 +854,7 @@ abortit: if ((fcnp->cn_namelen == 1 && fcnp->cn_nameptr[0] == '.') || dp == ip || (fcnp->cn_flags | tcnp->cn_flags) & ISDOTDOT || (ip->i_flag & IN_RENAME)) { - VOP_UNLOCK(fvp, 0); + VOP_UNLOCK(fvp); error = EINVAL; goto abortit; } @@ -882,7 +882,7 @@ abortit: ext2_inc_nlink(ip); ip->i_flag |= IN_CHANGE; if ((error = ext2_update(fvp, !DOINGASYNC(fvp))) != 0) { - VOP_UNLOCK(fvp, 0); + VOP_UNLOCK(fvp); goto bad; } @@ -897,7 +897,7 @@ abortit: * call to checkpath(). */ error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_thread); - VOP_UNLOCK(fvp, 0); + VOP_UNLOCK(fvp); if (oldparent != dp->i_number) newparent = dp->i_number; if (doingdirectory && newparent) { @@ -1494,7 +1494,7 @@ ext2_rmdir(struct vop_rmdir_args *ap) ext2_dec_nlink(dp); dp->i_flag |= IN_CHANGE; cache_purge(dvp); - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp); /* * Truncate inode. The only stuff left * in the directory is "." and "..". @@ -1504,7 +1504,7 @@ ext2_rmdir(struct vop_rmdir_args *ap) cnp->cn_thread); cache_purge(ITOV(ip)); if (vn_lock(dvp, LK_EXCLUSIVE | LK_NOWAIT) != 0) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); } Modified: head/sys/fs/fdescfs/fdesc_vfsops.c ============================================================================== --- head/sys/fs/fdescfs/fdesc_vfsops.c Fri Jan 3 22:12:25 2020 (r356336) +++ head/sys/fs/fdescfs/fdesc_vfsops.c Fri Jan 3 22:29:58 2020 (r356337) @@ -110,7 +110,7 @@ fdesc_mount(struct mount *mp) rvp->v_type = VDIR; rvp->v_vflag |= VV_ROOT; fmp->f_root = rvp; - VOP_UNLOCK(rvp, 0); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
