From nobody Mon Apr 24 16:07:05 2023 X-Original-To: dev-commits-src-all@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 4Q4qlF4Tryz472WF; Mon, 24 Apr 2023 16:07:05 +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 4Q4qlF3z1Kz47LF; Mon, 24 Apr 2023 16:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352425; 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=JQYfdnIMZGL+4wJpNEqADuySVzbdMIMmKzDqQpEciBo=; b=gNJfqegRf2TX8Zi7NeezeOIKnv2LuchPdZpMgMid4Uh13VjPQVxO8OBfNcC/AWoB79oc9y ZGz+I+DcMjQx1Bxbvj7La9pUzjk7l3FqenG/TQ/R+txRi5XAsKjZTTAiaf3IzaeAmpshzu JbIY0UKlZZImrUMN/DquWVhibAO5Ut06VVwUd9ibsdmlAR3D35UXty7QLwjReLYLc4uaLr vmt3OWfAvnz3Vv70AOwPLnz+1Sxdt2NPTa8dwoGCakBYTyoBBhoXJEN64p/B0LvZdzory0 6Im6DUuwzPaB5z5NVEAj2mbSqf7plght4pYY88F8KNJ/cmLFxXcU5Us3mc7odg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352425; 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=JQYfdnIMZGL+4wJpNEqADuySVzbdMIMmKzDqQpEciBo=; b=xgqNhl1Z2mnVF4IohyFI8oghACJZdh00ncvTKgLIYcaq+DCjR4jYJ0MaSEIKqJ71UWXcM6 E+hGgNjKdyVMsG8gwRnOulV9XyST0BkzbkwTqwOQdB4E6+9wX1Oh4XkhEyrwvaFtonWvi8 0x8RBdLjRo+YFHaEuzIZYSx0Xvf+DkYX2NZS/FvamR3vMfKsFkStLEEuiKS2mpH0Y+OELv 7DIEjfAPUufcHTmHX666F9YpZNpJ/K4WQHt2Sksw3XmybpAyqvUlL74glm/2taX41oYdOU FHqaBdpJvVsC+AHH+vWk05jRUFSYYv16ZuJueM9ygMsriiHYZWiuYP7VtUDk3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682352425; a=rsa-sha256; cv=none; b=u0RaC8rvijmCg1thKTEM0GSrYwkb+mAszrW3vx3L6bDc+G+nQHZVaVKJYc6fiFhjNN1Gg7 PWpRinDjIFWIpJ8jgWzaY6xlGOpOL6bNkQ5YsK3MeRjhmQ/Bm0pt3lvpTx/1tbTINdBIX8 c6J1Gp6DizGbN7nlPPRJEdRjLvyBBwFuldEEcY7v6d3MA6AA7WI9vg3sigXntFlcQ0yvc2 4No9lzSS+HGz9OhaFPHr19XnmfVrOBS7/XaiHkuI+IqmZrlQ1N5YcyIBxR/VkzwUsRW9+D 9zN+GQz6JqGf/rpgFRqiX1/pGA3VXHVoC9Enn0uV03O3lMZ1womMdqFEBOAYQg== 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 4Q4qlF33S8zX8v; Mon, 24 Apr 2023 16:07:05 +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 33OG75K9017707; Mon, 24 Apr 2023 16:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OG75nS017706; Mon, 24 Apr 2023 16:07:05 GMT (envelope-from git) Date: Mon, 24 Apr 2023 16:07:05 GMT Message-Id: <202304241607.33OG75nS017706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c5b5f2d8086f - main - cp: Revert "If copy_file_range(2) fails with EXDEV, use fall-back." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5b5f2d8086f540fefe4826da013dd31d4e45fe8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c5b5f2d8086f540fefe4826da013dd31d4e45fe8 commit c5b5f2d8086f540fefe4826da013dd31d4e45fe8 Author: Mateusz Guzik AuthorDate: 2023-04-24 16:04:53 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-24 16:04:53 +0000 cp: Revert "If copy_file_range(2) fails with EXDEV, use fall-back." This reverts commit 64333654908153cd8e2dcb408c57cc3e3c4f29af. The error is not valid per api contract, it showed up as a regression after 15f0b8c309dea1dcb14d3e374686576ff68ac43f 15f0b8c309dea1dc ("zfs: merge openzfs/zfs@9cd71c860 (master)") and was subsequently in d012836fb6165494 ("zfs: fix up EXDEV handling for clone_range"). Sponsored by: Rubicon Communications, LLC ("Netgate") --- bin/cp/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 9794152ac724..8c1c350ff6f1 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -180,7 +180,7 @@ copy_file(const FTSENT *entp, int dne) if (use_copy_file_range) { wcount = copy_file_range(from_fd, NULL, to_fd, NULL, SSIZE_MAX, 0); - if (wcount < 0 && (errno == EINVAL || errno == EXDEV)) { + if (wcount < 0 && errno == EINVAL) { /* Prob a non-seekable FD */ use_copy_file_range = 0; }