diff options
| author | Alexander Motin <[email protected]> | 2023-07-13 11:50:34 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-13 08:50:34 -0700 |
| commit | 736d5962b42e23c2caaae3de8c5387772239a9a4 (patch) | |
| tree | 7bf351e36a32d78f017d46f96f06f56ef3492f3d | |
| parent | ca960ce56ce1bfe207e4d80ba6e5ab67ea41b32f (diff) | |
FreeBSD: Fix build on stable/13 after 1302506.
Starting approximately from version 1302506 vn_lock_pair() grown two
additional arguments following head. There is a one week hole, but
that is closet reference point we have.
Reviewed-by: Mateusz Guzik <[email protected]>
Signed-off-by: Alexander Motin <[email protected]>
Sponsored by: iXsystems, Inc.
Closes #15047
| -rw-r--r-- | module/os/freebsd/zfs/zfs_vnops_os.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c index d29f00a0c..7692200ab 100644 --- a/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6263,7 +6263,8 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) goto bad_write_fallback; } } else { -#if __FreeBSD_version >= 1400086 +#if (__FreeBSD_version >= 1302506 && __FreeBSD_version < 1400000) || \ + __FreeBSD_version >= 1400086 vn_lock_pair(invp, false, LK_EXCLUSIVE, outvp, false, LK_EXCLUSIVE); #else |