From nobody Tue Apr 4 07:40:44 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 4PrKSF2qgrz438QV; Tue, 4 Apr 2023 07:40:45 +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 4PrKSD6tBTz3QDT; Tue, 4 Apr 2023 07:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680594045; 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=/E8chj8ge9IHUZpY7dqpkgxLJFiWMd+aBiopY7AcA2I=; b=UkaiTKyWtrjeyIPnNaZlcnc4UiZxY+oF0TrwZv48CJEfYPGpPimeaANUXfYfZ6Ab2+Df4v 9cblC//CfhpkEUG8aE5jzoLkZL/W+dxjEy+MqGi3RVtiJRrkChO3JHoBZtAFMauf/fbrPh rIVqHTw6HJLXyllmSp9VPIvUjspGjZxGC5HIyjQ48lYuBYtDi9RWKS0z+zufTBvtQ96x5/ YEaDD1LLAriVKZbj7fDPGHQAIuPICDx2L9mKftvFfu/CQhOzg3jODVNNfY8tO94cwWSgH7 yDyBsjzN6Vf3GS+IgEBVhE6IKOS0q9yMDcCKc08UP2ZqKDjqT4iv8a3uzjF/2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680594045; 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=/E8chj8ge9IHUZpY7dqpkgxLJFiWMd+aBiopY7AcA2I=; b=UHBSDxBvcEwPjDDBAJFUyartNhal7lkzMfFL5HNUDncxUQrpXRLW/nJ8tFC6xp0i19gOr6 bgAlJh8IVqRlHzrwJtu1BR83QljwfbBCuHv56Eg3PzPd3U08zVahcV4I5v9CrZtQmoCsYK oPQkA8SEiQPciz/BIfLvLDW/a4mHnNiYEUUUy3VM6g8tDLT2eAlBERbdrMNVNfpo1x1x9/ hXlJQDNO7+3uWSzdXa5+ukLGieKB4A2EN/JGhmCGOhX8ns+kEvcPgQ025yAFEkO0hJzyTQ TC2uTkwo/4t5Ui3C4agArFyuwDhG3rxnNhFv9Sq64c54TDPt2gT58SpmLKQNeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680594045; a=rsa-sha256; cv=none; b=UUpBrzWcXOH1ClRZLMyQjd5mK8VwcATzuRkXDXOYrZLrycZLgXEu7GNqWYYsTxuKE1R2My prlKMXICdMJrTOfD0/xLQASrQe/XHBj5AmQwNSzsBih3GGytfwxebyGg8Y8qPa2zfstk+5 3jRN4SCHNX2q/HkBn9GQ0EZUGPRu2BSAyuKHY1Ga/bCQSfKrNtcxDWIZoWyfiQxPEJ/Wfb C/yFvxf+Ia9z3QQYRekXlOwDB4xzjei7htkK1PC2KCUVmuligWntJ7jg/llR25r2Szk648 723+nHwtL3a3AE4vEUyT9LambTIhjhIcUopybSseu9x5Y10CTvuAsLY1zBnDjA== 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 4PrKSD5yRBzWpb; Tue, 4 Apr 2023 07:40:44 +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 3347eiVh033700; Tue, 4 Apr 2023 07:40:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3347eiU8033699; Tue, 4 Apr 2023 07:40:44 GMT (envelope-from git) Date: Tue, 4 Apr 2023 07:40:44 GMT Message-Id: <202304040740.3347eiU8033699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 643336549081 - main - If copy_file_range(2) fails with EXDEV, use fall-back. 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: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64333654908153cd8e2dcb408c57cc3e3c4f29af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=64333654908153cd8e2dcb408c57cc3e3c4f29af commit 64333654908153cd8e2dcb408c57cc3e3c4f29af Author: Poul-Henning Kamp AuthorDate: 2023-04-04 07:39:59 +0000 Commit: Poul-Henning Kamp CommitDate: 2023-04-04 07:39:59 +0000 If copy_file_range(2) fails with EXDEV, use fall-back. --- 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 8c1c350ff6f1..9794152ac724 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) { + if (wcount < 0 && (errno == EINVAL || errno == EXDEV)) { /* Prob a non-seekable FD */ use_copy_file_range = 0; }