From nobody Sun Apr 12 00:38:43 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 4ftWqm0LFdz6Y7yt for ; Sun, 12 Apr 2026 00:38:44 +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 4ftWql6gyKz4MXq for ; Sun, 12 Apr 2026 00:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954324; 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=jxqJu2DdL6hr2rP0bk6sw3ybdpDUFnK3/TVzApJf+8U=; b=sggLNp8YS8pF3tmaUOJLPpesE/EFgPd2fPYH7awGhMZVel8kU8qXtd30Xf829ZlprclRRf MjGcpJNZ3rnBPyJTcAkR/PWdx2bJQrUTfE5D7HRt3dRn+ApgH0GSNB/gsjLPr9s3zcgyPs k5c+wr3QXX2BDm+FIhT5YO1XLSlrStY2WUbP4injmexE3QZ9Zb2C5ecT9v9L2f/QSJhz6q rw4oHs5VIeny433C0BqLAaNZeyHFSiIDLVYULD6OKlW0giQVOlBStJa9wahkHx03n4mFMz qLZHl5CoO2bC6cQveAxZ2wU2MGeZcz3ZMzzl+EApNCmJAhh/6tsV2+8a7OQpYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775954324; a=rsa-sha256; cv=none; b=GoiQj3I+olLjnD5d7ZqibclGo4O2rs/IP3ErzN+mbi16dEM0bpzo1/TN2CqtNjNejrNGzh b5taEgX7tfPhY+v26uYxGL+FCDWpAtzp9MbQK/gRTRytJQMfrBSgsWL6YYwH6GVIjmCyLH yZd2NymxgQPy7ss5USLfC9rWvplZRv39loDNa5f037himzFCw2U82VHurAG2YEVloQ5Rzt vix0ZkUKRXE+z+eFLaSQ40gIxmZQRwKmm2rIoB4rGl0K/LE5v2S4U3zLlgkBhtdRbnhTmy I9X734N7KsI2S6bf6cfd+kKbtZQO2VY9dRvdPeRRC8QBLi0gPFbWAAMuTDjV7Q== 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=1775954324; 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=jxqJu2DdL6hr2rP0bk6sw3ybdpDUFnK3/TVzApJf+8U=; b=AcLtj2nBfsaTzOY8PJWCO8WE3PkU3IOz0V/W+hX29mmUWumpdHjQuklKKV9l75kzH8k6/K HO/L58vyBpR2jivd6LOmgRCQrjvKEMFE5luGnPPa+EbGIQfJr51a3KOnUCEBa+1eWE3WJz EgOck9ah/YylhJBpejSj2k64u0zRsy/EbPVMk9prlIa+yPdR61sFNsi9zPKEmGnGprjM3F K6Q+tGUiyHPAH606qGLBMCMxIr2wljiKucSr0n/2HX8CRYh4ziakPk0tvOHkN7mhd6V4Dw h9YOHs048i1KrRnB52OBAAwESTCiHilyT7xdQUwOrifua4Iunp6/DnNWjxNKmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftWql602dztd3 for ; Sun, 12 Apr 2026 00:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 00:38:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4beef6a4c567 - stable/15 - nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs 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: 4beef6a4c5676249c6e87de5354938d5b15dbd88 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 00:38:43 +0000 Message-Id: <69dae993.37f67.4315677e@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4beef6a4c5676249c6e87de5354938d5b15dbd88 commit 4beef6a4c5676249c6e87de5354938d5b15dbd88 Author: Rick Macklem AuthorDate: 2026-03-29 21:41:36 +0000 Commit: Rick Macklem CommitDate: 2026-04-12 00:36:51 +0000 nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs 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. However, without this patch, the Copy/Clone will fail with EROFS if the input file is on a read-only mounted file system. This happens because Copy/Clone will try to do a VOP_SETATTR() of atime to set the atime. This patch pretends the VOP_SETATTR() of atime worked for read-only file systems. It fixes a problem when copying files from a ZFS snapshot. PR: 294010 (cherry picked from commit b5815ee99a015c6ac118d7e9646d0c95b72e9f2d) --- sys/fs/nfsserver/nfs_nfsdserv.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index bf0f638c52bb..55bf56c4daf1 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -407,7 +407,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, int preat_ret = 1, postat_ret = 1, gcheck = 0, error = 0; int gotproxystateid; struct timespec guard = { 0, 0 }; - nfsattrbit_t attrbits, retbits; + nfsattrbit_t atimeonly, attrbits, retbits; nfsv4stateid_t stateid; NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; @@ -481,9 +481,28 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, */ if (!nd->nd_repstat) { if (NFSVNO_NOTSETSIZE(&nva)) { + /* + * For an NFSv4.2 Setattr of atime only that fails with + * EROFS, pretend the operation succeeded. This makes + * the semantics of copying files from a ZFS snapshot + * the same over NFSv4.2 as it is locally. + * Without this "hack", the copy will fail + * with EROFS unless the NFSv4.2 mount has the + * "noatime" mount option. + */ + NFSZERO_ATTRBIT(&atimeonly); + NFSSETBIT_ATTRBIT(&atimeonly, NFSATTRBIT_TIMEACCESSSET); if (NFSVNO_EXRDONLY(exp) || - (vp->v_mount->mnt_flag & MNT_RDONLY)) - nd->nd_repstat = EROFS; + (vp->v_mount->mnt_flag & MNT_RDONLY)) { + if ((nd->nd_flag & ND_NFSV42) != 0 && + NFSEQUAL_ATTRBIT(&attrbits, &atimeonly)) { + NFSCLRBIT_ATTRBIT(&attrbits, + NFSATTRBIT_TIMEACCESSSET); + NFSSETBIT_ATTRBIT(&retbits, + NFSATTRBIT_TIMEACCESSSET); + } else + nd->nd_repstat = EROFS; + } } else { if (vp->v_type != VREG) nd->nd_repstat = EINVAL;