From nobody Sat Apr 11 03:35:15 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 4fsznw1VBkz6Yw6T for ; Sat, 11 Apr 2026 03:35:16 +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 4fsznw0kBYz3xN0 for ; Sat, 11 Apr 2026 03:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775878516; 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=3v5BDe8iSVz+WzKbi7dyryvCNiZksQ1OZzjTxj/tLdM=; b=OG/9z4ixiX1TvKQIb3sauyWOz7M95KwlLQcekbB7KB64wB3oE0ND3J+lpp5moz6Ipnplt3 x9cyPD5PGuzC48YP4uWpF9X1S8nN3gU1ZRz2WODje3vLH5EeWgTR4eRC8MJ6Ie6vvb0cNs Me0yGJYn+d9HjeIcAIvioOlh0Z8qxFo4Ow92xb1GCfAT+Hxvrz/Dm4tM194hcZ0f8yySq+ fp+51Eu73kHgetGosalwkNKoTgoolMguG4Rp7JLXn98Z4jzyEhhOXQIsbPFJNrLeEAPuHQ PrRaGiIF5H0YZ4tPdWUcewEhgXJq8NEztREUzYK+dLQwHRWXJv6yUvbjtm8P6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775878516; a=rsa-sha256; cv=none; b=uxcAywXfpvBlZURdabWyimA//KIvTtUW0f+yZdsIJzAAwsu7zJ6ixv2XEFGK/zB4YOv4jY aEdDTjLbpb8LHZANO5RJhdo/UkrjCTnXhXlGf58242wlsVBvNNdeXsoAsJ5MiYsMMXO069 H/rRre/DR2195t6CU6fHLGQLr+Tbw10jZgYATd7xldn4QqSAYiIz7QjUIj1nrEuQbjbxoQ 4bs3G2X2/UUeJ/5v8To6KHjgKhaI/n/ZJG+ugKaLuBVP/k8D8/OYnPnNQUOzeq1xyp6W9S qQYqmDcSPRg7Tq015bWLr5UbwUvugJBEoWE/8dFpoEEmphCQmqxZUzP/YPtj9g== 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=1775878516; 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=3v5BDe8iSVz+WzKbi7dyryvCNiZksQ1OZzjTxj/tLdM=; b=gJjdj/3bss68+UMduO2PR5L0RLQU7SERr1KczjRFkYQh4ZAWEyWP4G8KvII8syLHafTk0e HnXSUygUmMbSF1rGqLEE7h7FTT6JO6Hwq7noG/CKuyVnNWmXPBVqlBifsL3g8lzI7DnhOQ ntzcRJ7+sdBiQfGPejvlje6XwFfCjczuJbP9wNWVhxCKE9aCBFuLKluwsmN5MHOsT/HRZB wYPBdPopNnL9Gq5JvaNfGxsXMUbxyDJ2QO2YVh5vNiO5nf7wuEC2hcBbiN7yfrIpnGicie EQ9ueWqObAyWk+p+4YamsANa0PUPWT37kWXqaIh24ZUjN6u7LlWzJxONb3pLMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsznw0K1mz1CNs for ; Sat, 11 Apr 2026 03:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 03:35:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 1d4e9d2b5ef5 - stable/14 - nfs_nfsdsocket.c: Allow Copy 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/14 X-Git-Reftype: branch X-Git-Commit: 1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 03:35:15 +0000 Message-Id: <69d9c173.18ee8.4e938d06@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 commit 1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 Author: Rick Macklem AuthorDate: 2026-03-28 19:39:10 +0000 Commit: Rick Macklem CommitDate: 2026-04-11 03:33:19 +0000 nfs_nfsdsocket.c: Allow Copy 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 d1b6198ba0e1..81c224860cc0 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) { nd->nd_repstat = NFSERR_XDEV; break; }