From nobody Sat Apr 11 03:35:15 2026 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 4fszp11pxSz6Yvms for ; Sat, 11 Apr 2026 03:35:21 +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 4fszp11KWnz3xb2 for ; Sat, 11 Apr 2026 03:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775878521; 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=qfpuJHF6aro/DiT+ImMX4dus10B7WvmPnn1lg19yPKzvRdW2nUUGb1Gf+WHc+yJFeGG5/d MXuLyYt5OysxzvyE3oo2M7OeZSrnv3ftEVhoxPnlH7YcbtxOgqc97IEttSSwfC5tyNS8wi ARCQBBx26CG4dD0pLglCZloxVO18D+A2mYYYjXhw+QoJHVuSVANOCQgcc0klZswQh2U5t+ Xt1bwpqAtLOaI9g4bCfdufgu58xTkO2+yr+LQXuUG6qRNTHf53c1mY5dA5Ve2nAQx4TUCu +O2NKjr4ulVIitxalJb+4IAkmz+Bb0au0RBfQ3uJNdYsjVqf/3YdHp90lre5BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775878521; a=rsa-sha256; cv=none; b=CHVbAXsRnDCoJkld6hSkyZAlNfnYWrw8fDLLMxhg+8okZnalpEEJQhL5cDteKnFF6M4grS e+/kcY3DQB8Y3Ak0sEtf/XCAQTvEZ/Q2ebmz6dBvlc59SHfFgsGxTZWEv2jEw/8b7xhFoq 3dJ5b6eHEplI4S87TuXp6ttBlnBMN84Gf7rrcH1eechZubeeWF4ZyYzM6AnjQN8MeG4hC5 QxWVnFotCBff3Gpd8qA26/iB3CEu2ViexJLQftVlDwut4JgEm+80jgRnU/PnvW66WTXgTx gVdVwJMaGguoRCX/TGnYX0+kITaX5LshSfDMzNCGWy+oTq1yXyUD8UzviK/wXQ== 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=1775878521; 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=szpTwqIHTVHtlWuTtKCCyh4FDwDm9z8eshdOscrHE/RKqctvjFHJUZ9vALibonm/WTJSRn BxwNuBBOjehEcwuKspntXIX1FRb0ltSLa+kGuopbGQ6gbWTkZ/9YYTW+IRqV8fVxKsF1Os kYS4w60rBflpQlJDpN9k78nmexG4E5gV+qA2SGDMP8u4fbjzsZ/HZAIRC1mwxsoxnypn3b 9RgeJvGc/mvVuE++Ol7W6qlkDROEDWE+y3OmP0qMlVSu2WalrcRPMfD3ykWHKpwJvs7mu9 GGQ2jggFxE8Q0pXDS+YZhx88RC/xX7OHT5b01OPO+/I/Z27l8byKovSKYnOevg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fszp10jhwz1BTl for ; Sat, 11 Apr 2026 03:35:21 +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: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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; }