Date: Fri, 7 Apr 2023 23:38:19 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 182b21d46276 - main - openzfs: adopt to the new vn_lock_pair() interface Message-ID: <202304072338.337NcJU1026673@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=182b21d4627655ff95f9ecd8a8e1066184391f16 commit 182b21d4627655ff95f9ecd8a8e1066184391f16 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2023-04-07 23:37:20 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2023-04-07 23:37:56 +0000 openzfs: adopt to the new vn_lock_pair() interface Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 2ddc7133d416..8a0a1d07c590 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6264,7 +6264,8 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) goto bad_write_fallback; } } else { - vn_lock_pair(invp, false, outvp, false); + vn_lock_pair(invp, false, LK_EXCLUSIVE, outvp, false, + LK_EXCLUSIVE); if (VN_IS_DOOMED(invp) || VN_IS_DOOMED(outvp)) { goto bad_locked_fallback; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304072338.337NcJU1026673>