From nobody Thu Jun 18 15:47:04 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 4gh4pw5Bzrz6hRqJ for ; Thu, 18 Jun 2026 15:47:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gh4pw391Yz3CBX for ; Thu, 18 Jun 2026 15:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781797624; 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=MchWMxe/xsZ/1qLkQZBE9M0kD3m140UlQdn8F/rptNU=; b=OeSbQexi1KVKuvGmJ7gX5rysYNiKEqw6LzKy5QjpuPAAqsBuklkfc2/6/yUlTJ9zitN92U dhGWoOnYhEXeoofYmsnzaLCvrcdmzAWLXeT9otWVzaO1KweLEQp9EQUJJJNAr25LrU5rUG esaNPq7I9x9egnVqBwezBOj650HfHFaxjon4lu+s44mIyi4KEqDgDbhHPiX2I+FkF+5NIZ wLkYFzvZXWO5JzkCrCHcwZwoZSQAkF+4R7Y8tTVpNE5OR0IYjkWnrrhZPuW5fwoWFogm3h zfN6my85cvnvMIDvMOCrFeRV8lsOmunrFYtDOu4i2+NuZq61fk3WXFA9ilZb9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781797624; a=rsa-sha256; cv=none; b=gpZJ3xjm72lNry1yh71xRQ4fJr4obj8Pgw5/VBzZT4fUTklNwJqgmvEWFdO6qr7Ab7eEh+ 5jcoSo/fSZhykHxqxbb9fDi8BO1Mvc0n5xj1bjZaHhu0R0cjbSyoaNvoD8nO87AHq/Ev2g +Wedf6mHkWfhQ7TbZp7BBcpdi9HcFnhE3gPIqnCxbIHgCP6KEv3mDBy+FDXehzYhhDAvtf UugLFBbCRHbndSw7da2Ga4S5wp5/7lJCXES6i+HqZ3A996baDdL4TG0akmfpjEXvpRRXY2 Xfq9SG5Aafr5u5eMUQgk8IrKyU9lmrsB8CjU2qSBtospqoy/OyaIOO3dU7WeZw== 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=1781797624; 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=MchWMxe/xsZ/1qLkQZBE9M0kD3m140UlQdn8F/rptNU=; b=SPqSI2/XHQzwSQxytagrmp2+Zf17Fdl9NziEDK6hd5Xhdsz/KCOlOt5iAG8kBS9lIwFH3X 4bQ+VDP8hTnGijfM3BPS4MLqsteqFEmydMRJ6sAZOdKlo5dVmwUz8rMVzi7VcxoeZEaKMd lCs4PyWSNmoPizVAu4CY9eFc1rRNeMMl4YnvuWeTejq7B73ETImEuMQcbLmicOZCGR53Qj S2awf/zV1nFDApFR82vPZOlFG+chnFSAH+QyzBs6COb5IFBbwoJIEAJVEkwW4aDS5c6F3T 57SQpTco1wzsHbVlmtRarI7NwhF59fumFJIiqLpxrpGOUHstSOtgQvuY8tOFUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gh4pw1z0Pz14nF for ; Thu, 18 Jun 2026 15:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 443d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Jun 2026 15:47:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b1af05406b51 - main - nfs_nfsdserv.c: Fix setting of birthtime for some ZFS pools 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b1af05406b5117d76f567056fba0a023a6374465 Auto-Submitted: auto-generated Date: Thu, 18 Jun 2026 15:47:04 +0000 Message-Id: <6a3412f8.443d4.2e248cb0@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b1af05406b5117d76f567056fba0a023a6374465 commit b1af05406b5117d76f567056fba0a023a6374465 Author: Rick Macklem AuthorDate: 2026-06-18 15:45:27 +0000 Commit: Rick Macklem CommitDate: 2026-06-18 15:45:27 +0000 nfs_nfsdserv.c: Fix setting of birthtime for some ZFS pools Some ZFS pools do not support va_birthtime and will return EINVAL when a VOP_SETATTR() of it is attempted. The MacOS NFSv4 client sets va_birthtime (TimeCreate) in the same Setattr with ctime/mtime and other attributes after a new file is created. The EINVAL failure leaves these new files messed up (mode == 0). This patch pretends the setting of TimeCreate succeeded if ctime/mtime were also set in the same Setattr RPC, which resolves the problem for the MacOS client. If this fix is not sufficient, a new pathconf name to detect if a file system supports birthtime may be needed. PR: 296066 Tested by: Will MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 9e5235f95ed1..fe7f0e217a74 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -579,6 +579,16 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, NFSVNO_SETATTRVAL(&nva2, btime, nva.na_btime); nd->nd_repstat = nfsvno_setattr(vp, &nva2, nd->nd_cred, p, exp); + /* + * ZFS stores with early versions do not support va_birthtime + * and will reply EINVAL when setting is attempted. This + * breaks the MacOS NFSv4 client, so pretend it succeeded if + * ctime and/or mtime were set as well. + */ + if (nd->nd_repstat == EINVAL && + (NFSISSET_ATTRBIT(&retbits, NFSATTRBIT_TIMEACCESSSET) || + NFSISSET_ATTRBIT(&retbits, NFSATTRBIT_TIMEMODIFYSET))) + nd->nd_repstat = 0; if (!nd->nd_repstat) NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_TIMECREATE); }