From nobody Fri Apr 07 23:38:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PtZYm1NXYz44LKW; Fri, 7 Apr 2023 23:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PtZYl4rMrz3hbW; Fri, 7 Apr 2023 23:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680910699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uf7T0yH08xE57uzIoBxR/6WKc5/0hWSPYoJG1RobOYc=; b=JfBF0x3ejPZ/L3C4n+VEcEtwDBVEWZWeV9NeXXLVOSjJQamKP1FOi1g05Z/jO86x5cDDAs yVqQ/xDMZwNnW+MTBXma6h0JPGH7A460808DIO8S/jJmEXHmmvVH0bx3o/FWK3tWoncSxf OOzMxnj0xI8XVVJ6lqXuhE61wh8opy/vUyyZu9gnXqUzxE5KcecnWteFWa4yF7Donofg8D GLXgL7Zzidd019MadCGFBcHqqk4Th8ibDQodJFouOvOD8tHyQqfkyE1dMZnAumVdYVyJgd EWEOl/yAbNFkh6rTfj7oY5rDXf49aVr6xI7nEP8ys26PIf4klm3x7OpUoeVtyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680910699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uf7T0yH08xE57uzIoBxR/6WKc5/0hWSPYoJG1RobOYc=; b=E7nEqEdnSsFGbxPxtatG1lJYFLuXceALUNPnzDVmd0n86aLc9jcKTobEIyGS7X5kp73b4N gnvE/FsDjW3XfkzhaRZTrypJiLIwu+9nwygVss3d6fMtdXHPAo/7hYkOPTpcqYriA59pO6 1axQMzwbq4kHcdpBtSaTtqNCGl4igqiW9bHmgPWF8aH+WZUELzSfh8oiHp4yjhoVbtOOnR 4LtPSzsuYcpam54QhMzxen1ph/u0mN3/Frdzva2gsNegjKDaWgTX80X2uHGX7blwR/CvKb pakIgZ1wCaY2wKuJ4i8Df1PLeJSl4cIueuDKYMb6oIZRHwoLdoug4QmBAeva/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680910699; a=rsa-sha256; cv=none; b=JJT3OTV/PL50f9/m7t1ndqz6EfnI95LjXnDKayqrviBhBtGyrAOwHFPlpC2tNJ6dGgoz/Z cG148bwbt+Cj1VmMzjUKP/pBsalJzwI0KaE6STBbnYrASeIqJOmPq12h6iq+/jz7wd42P9 ut94hIRhD8np3C2/RS+O0eI+wT9ZMPHlvj9Lk6Ht2wCtoacRKia+D3jAojE+MJ02a+fTfC GzDvIpZUKPrkZNvoZf6k8Cy3E1Wgo1dBqlZKx3Pia2zKWa/aMthKNOiiPqTC+6S+pAXT88 p+IvwgSMWB1W11IC6yZwVoUEfVigFk/MuKpPf4z/51Yq11yxqVJEaizAeZw8fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PtZYl3qgtz14X7; Fri, 7 Apr 2023 23:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 337NcJre026674; Fri, 7 Apr 2023 23:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 337NcJU1026673; Fri, 7 Apr 2023 23:38:19 GMT (envelope-from git) Date: Fri, 7 Apr 2023 23:38:19 GMT Message-Id: <202304072338.337NcJU1026673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 182b21d46276 - main - openzfs: adopt to the new vn_lock_pair() interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 182b21d4627655ff95f9ecd8a8e1066184391f16 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=182b21d4627655ff95f9ecd8a8e1066184391f16 commit 182b21d4627655ff95f9ecd8a8e1066184391f16 Author: Konstantin Belousov AuthorDate: 2023-04-07 23:37:20 +0000 Commit: Konstantin Belousov 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; }