From nobody Tue Apr 4 14:34:47 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 4PrVdz3z1Gz43frn; Tue, 4 Apr 2023 14:34:47 +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 4PrVdz2Fgmz3Lv1; Tue, 4 Apr 2023 14:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680618887; 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=ofP/9uaNjx/RjL/5MMGRMKQkKuxlqEv1wX4pLRMMs1A=; b=eJuYlxk58wEBOhZglCpYY2l/dVMsRwgtZFfSyWjn9vH0YDfyqarCwEbNrRYNXqmhxOEbfr yBshyUEtF/6OHy2eQvhgYZSq01aJGjish0tu8LDfLhydVCyzougj7Rcl0cWXPoHNriPoYh WpeQnYg+t7RxU/4Yhowd9b1D9hsvaiPzzgwkAPLzMCNBh8tqf9j8P+RrtCOwa+zVXlKSGG 35eKrhkU+wPZTYTRBhpthYNB2dQI9rRxP7IXcBFtzTicZaMkC4eTOKroRLtb3C7s0IYdUj 9Fm4y3g/XnAHhjBo25OK/pXg3rPSMWi5yoQBleWY9H42+UYgdHI0LsmmL8fMIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680618887; 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=ofP/9uaNjx/RjL/5MMGRMKQkKuxlqEv1wX4pLRMMs1A=; b=Azf8GJVH0bXW1aQlV0yzX0r9fT6yEupGGWR2MEpgPgle+HZ39giWs4u/5V83kkvjaFPsCm 9kUVw8k2SOg9cnq2roD0dEZ2pp7nUIah5Hgk7Z80D9Iz0LoG1rVAE84dywvihy2LftauCz KiDoM+W/d5Jn0dbA6OwLlT+AIDohKnpt9d/mlezJO2hi0VLOJsCLIuelDVtCqX8VIIQxJN jFsbmbZdLh3rs1SjeguV81VOZdJHw/KzWm8jPvlUpcZinemuUQYkVLRNHPx7OX+O2h9EWY aRf3d3C6S4Tu5vljfuPzwFqTG53Jx3JehSW8oMRKnzi8FG/vqirOCHuhPAW9jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680618887; a=rsa-sha256; cv=none; b=APZMWfKH0uhk9qNpDtUSknZLTx5ZKUrkgaARiT67wxwk/7A9g0ZHPMdfMD/UfzwvRWeUhV swX8QKnzW8BqofxyM9amvFxkOd/NG03SYCzQEMz0jaWLet46oz5zOjCnfR97BL6XHO2tjU hiudgT2lQpYlAbNVWUqF0l4Hm1rf3/lZ8Q8xXmgPSpHyn+twePUxG2vfz+pZ7qjH/E+I9v olebqwSSTGFKf3aXujZsk6uk3cmPMTalNthAsmmepJHFixDxKfdOz6c2fQApzCEb6cndRf TH+NOYq9zW1W78NfyMNUSKeXzESd8GC/QnqOezjaEUiuXE4BBzcBz8PnpwYTNQ== 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 4PrVdz1M9PzkdJ; Tue, 4 Apr 2023 14:34:47 +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 334EYluk014911; Tue, 4 Apr 2023 14:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 334EYlj6014910; Tue, 4 Apr 2023 14:34:47 GMT (envelope-from git) Date: Tue, 4 Apr 2023 14:34:47 GMT Message-Id: <202304041434.334EYlj6014910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 91ef6f14f234 - main - Revert "zfs: fall back if block_cloning feature is disabled" 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91ef6f14f234a12eb6cc961be01a483e9a0a5955 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=91ef6f14f234a12eb6cc961be01a483e9a0a5955 commit 91ef6f14f234a12eb6cc961be01a483e9a0a5955 Author: Martin Matuska AuthorDate: 2023-04-04 14:34:34 +0000 Commit: Martin Matuska CommitDate: 2023-04-04 14:34:34 +0000 Revert "zfs: fall back if block_cloning feature is disabled" This reverts commit 8ee579abe09ec1fe15c588fc9a08370b83b81cd6. --- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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 2cd1d27e37bc..97429b360a36 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 @@ -6243,6 +6243,13 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) int error; uint64_t len = *ap->a_lenp; + /* + * TODO: If offset/length is not aligned to recordsize, use + * vn_generic_copy_file_range() on this fragment. + * It would be better to do this after we lock the vnodes, but then we + * need something else than vn_generic_copy_file_range(). + */ + /* Lock both vnodes, avoiding risk of deadlock. */ do { mp = NULL; @@ -6293,16 +6300,6 @@ unlock: if (mp != NULL) vn_finished_write(mp); - /* - * Fall back if block_cloning feature is disabled - * or other EXDEV failures from zfs_vnops.c - */ - if (error == EXDEV) { - error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } - return (error); }