From nobody Sat Apr 11 00:59:12 2026 X-Original-To: dev-commits-src-branches@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 4fswKr3Nltz6Yj1Z for ; Sat, 11 Apr 2026 00:59:12 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fswKr2dJSz3ftj for ; Sat, 11 Apr 2026 00:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775869152; 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=+g0GLtu2+D6dOVmyo/dXwHdo2254clHap5bjRZJI1HA=; b=ZY+/zwz6EBDaCSkjAugP1+rzavQcAgoesa25w6Wl8tnL9YpOxsYuU9gxuwsARhA/Nxlpm5 6DEcWjcHyAwVCrakK+j3k6VxQFoSE3eNeoPmUem3gUKbLiC9ohDuve8K1a3KUMEzIBgo5q IQcZAORV0MChzUxxJOyhoEKgYcCRkcaH5LXpeQ+cRF6XyEqI3L0Pglv0y149k+q4MUsAm9 zy8oTzbDKaQFwwiD9Q1ZOeWQeXQOSdP/KBYTucwY70/rkEeA0+CZvf7KsLXQmauGEv9E2R BVseYqKkwQ2L3PJfBITSoNFLRmqn/NNWTAH70HBP3kEKPS8p+Ct1SPdyuk30Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775869152; a=rsa-sha256; cv=none; b=fAGeSiS2/GF4MDUAs51TxWjPaayEyqC/j62ZlBtOxUPyq8MeAXzhP6q5fHTGZueqpgr3kD L0k30Hjyas/0aNc/nq/jaP8RnwFgQxcRHYCAbmgtMwXPaKVkZ3euVyuIxP57TPCd8BGPsv L72tsUE6pn0rWrqNDPOu0mVtLghcTlvRcYP/sdGatvZ2dMVb23v2PmfpYrL1epjc17ZypA oE/qeU65HcnOtNarQ7t3HL51iNIuXsxEwTnUK8wlo9tK471e9BIXvbGG0J8B+KkxPjlJTl JjLYXcNvz4lziyZHdebefGzG/cASF8h29LpybaS1U5ujbmFlwHSnu82KYYrPbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775869152; 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=+g0GLtu2+D6dOVmyo/dXwHdo2254clHap5bjRZJI1HA=; b=PCfEu1tDgh16YSFq70Nsh8VzInwwtH7FLnRLBpNT/x5AjlgntyXtClWG9XOwT7gOSHCUDd 2xXWb0MuGk/sgKOYOHzgyBbncoa0EIyta+Yzz09X4tCJC854p7Rgl1iiZ/UA5ct3tj/AD0 F5j21gkFvHd+LIu6vowX7dF7J3U3xNTJ+Axt2QgF3p6e+Ql8l9Z6c3F/Og0Sx/3XqZAzJv BL1wQZYxPyPCXAYyJl4ROfFpSEUeCMP41ww1XIbGqilUtQ9Av57qaZu7NkUgGAB4w8XbI2 CeZYpkwkGkoIg668DMBo4Yogwxevp5ARk40K7fICvitLv21MZVWqg+dJdU77GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fswKr1zJ8z16M9 for ; Sat, 11 Apr 2026 00:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 00:59:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6dddd2503fc7 - stable/15 - nfs_nfsdsocket.c: All Copy and Clone across file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6dddd2503fc71b6e192b198209cdcd81b1b04fa8 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 00:59:12 +0000 Message-Id: <69d99ce0.38d31.6edd2027@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6dddd2503fc71b6e192b198209cdcd81b1b04fa8 commit 6dddd2503fc71b6e192b198209cdcd81b1b04fa8 Author: Rick Macklem AuthorDate: 2026-03-28 19:39:10 +0000 Commit: Rick Macklem CommitDate: 2026-04-11 00:57:08 +0000 nfs_nfsdsocket.c: All Copy and Clone across file systems For some server file system types, such as ZFS, a Copy/Clone operation can be done across file systems of the same file system type. As such, this patch allows the Copy/Clone to be attempted when the file handles are for files on different file systems. This fixes a problem for exported ZFS file systems when a copy_files on file_range(2) between file systems in the same NFSv4 mount is attempted. PR: 294010 (cherry picked from commit b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8) --- sys/fs/nfsserver/nfs_nfsdsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index 636c4735a131..d6cfdb6b9c8e 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -1272,7 +1272,8 @@ tryagain: if (vp == NULL || savevp == NULL) { nd->nd_repstat = NFSERR_NOFILEHANDLE; break; - } else if (fsidcmp(&cur_fsid, &save_fsid) != 0) { + } else if (fsidcmp(&cur_fsid, &save_fsid) != 0 && + op != NFSV4OP_COPY && op != NFSV4OP_CLONE) { nd->nd_repstat = NFSERR_XDEV; break; }