From nobody Sat Mar 28 19:40:36 2026 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 4fjntF3X8Kz6WXNG for ; Sat, 28 Mar 2026 19:40:37 +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 4fjntF01tJz496G for ; Sat, 28 Mar 2026 19:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774726837; 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=jEjJpMTp1z1UGN8vBH0SYElg4VH2yi/VAA1nz6pHLw8=; b=X3EPJGu26IH8cE8/P1oKHS+/LGo7Ckwqx9NT+3KcQasVtSb14BHWZk19ttpN29WrijZQ4+ QTgB8bPi4TNkXDiL71RYcFft9QWRo6HYM7d5hJAYPwRHAf3XxnJBoZABUBrhBfGPN9Pkru 4/uYX71mIuN58jaSuGwsKBT1akiFCtHcEbuKx5TJoixfsFvSAqhtfq6ZDW13n8/69526MW VSNWPVslm6WjyVY1QTbLG+dhnQOOl9/XWPu64+hBKPbeyHJ/VBR2O75JeFYASuiPwRaT71 ol7IAcIxNjWVBANC7wtRKhTcD4sWTurCxj1bgxuG6Ijlr6EFhUBwnZv49tZiaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774726837; a=rsa-sha256; cv=none; b=Mi2Ze9EI1jLMMM9v+rc3TSgX+LokIRuEmI6OQgwgRRDnI0+lqczk3DFYXtfzejssEdIxMt ovzKFRwcJWE5eHJ3+ShzjliY8CtEwvbIFzzZtgoybRzR2xDWn/nyRkRCZB6jn+zid/fEPI TBGPpsC1XDaN5RLKXz4aVR4NhVQYKo+6Xfg1Gl50n9lXUOO5rCTsUcnQRBU/vNTVcHkRpl EMt7uAhDXUpKjUCAlNf7OVH2UxqfKgDAr0iU8nwkdtzkfllPHL/xPTqDRFAc0zmWmEqgxU IPATPJmeQlCpTK5k2fMF2Txt/1WcQLsjW43j9pm3wKJ20EF6sf1FXAmi3RipXQ== 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=1774726837; 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=jEjJpMTp1z1UGN8vBH0SYElg4VH2yi/VAA1nz6pHLw8=; b=iYZefTJMz8HVHOu1t37OFGUxbZuLLY9SnddZt1xBjS+nuvyy7l65+h+mCiOmH8rDYOZs7/ rFP8Z7/lS1gfxTeOtNNnHIDS6wj8bKVVnKaniA0yU0oNrp4dzQKXaXSAPvusis5IyPpNby RZL58pfxaaMNGBDAhjPg+RhDpe778rO3WdoOxHQQy3Tz5aFS7lPyb4l8ypNREw0JV4k8ET QqLEWXt/PKCCYUyZdEYdQaz+qV77Osellpm2i0icv/8OX5HJgfGjClNtrHLHq1F2GzZhMv Mlhyy1Od1CGvD72lbiatPmCpyG8qntzP3nweokjwVUWF3LFYrOpZDlOa0CI5qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjntD6lY2zfsD for ; Sat, 28 Mar 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Mar 2026 19:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b65e7b4944cc - main - nfs_nfsdsocket.c: All Copy and Clone across file systems 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8 Auto-Submitted: auto-generated Date: Sat, 28 Mar 2026 19:40:36 +0000 Message-Id: <69c82eb4.20c88.6055a15d@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8 commit b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8 Author: Rick Macklem AuthorDate: 2026-03-28 19:39:10 +0000 Commit: Rick Macklem CommitDate: 2026-03-28 19:39:10 +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 MFC after: 2 weeks --- 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 201f3b74b946..efa7906dffc7 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; }