diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2022-09-19 20:03:01 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2022-09-19 20:03:01 +0000 |
| commit | 4e1262ac99272db5c65f924acf9686876742c2cd (patch) | |
| tree | b123e4a2b7230946df411b26d45cff4d21a0d80d | |
| parent | 620d855faca136d661a86dfa4cf74dd4f8794740 (diff) | |
| download | src-4e1262ac99272db5c65f924acf9686876742c2cd.tar.gz src-4e1262ac99272db5c65f924acf9686876742c2cd.zip | |
zfs: stop passing LK_INTERLOCK to VOP_LOCK
There is an ongoing effort to eliminate this feature.
| -rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 2c35b74cd3fd..82f0ef335d38 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -977,12 +977,13 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) */ VI_LOCK(*vpp); if (((*vpp)->v_iflag & VI_MOUNT) == 0) { + VI_UNLOCK(*vpp); /* * Upgrade to exclusive lock in order to: * - avoid race conditions * - satisfy the contract of mount_snapshot() */ - err = VOP_LOCK(*vpp, LK_TRYUPGRADE | LK_INTERLOCK); + err = VOP_LOCK(*vpp, LK_TRYUPGRADE); if (err == 0) break; } else { |