diff options
| author | Mateusz Guzik <[email protected]> | 2022-09-20 02:17:27 +0200 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2022-09-28 10:35:13 -0700 |
| commit | 2c8e3e4b28a40e6a1b1926ce03da1a725f0e60f8 (patch) | |
| tree | 74135f5f7596ee34bbf8bcbccba77e1ef95cf362 /module | |
| parent | 55816c64dadac5fecd858a88f769184283a4808b (diff) | |
FreeBSD: stop passing LK_INTERLOCK to VOP_LOCK
There is an ongoing effort to eliminate this feature.
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Mateusz Guzik <[email protected]>
Closes #13908
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/freebsd/zfs/zfs_ctldir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/module/os/freebsd/zfs/zfs_ctldir.c b/module/os/freebsd/zfs/zfs_ctldir.c index 3a5c9f8ca..5bd2e1510 100644 --- a/module/os/freebsd/zfs/zfs_ctldir.c +++ b/module/os/freebsd/zfs/zfs_ctldir.c @@ -976,12 +976,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 { |