From nobody Thu Jul 2 01:21:11 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 4grJxP3CKlz6l0kK for ; Thu, 02 Jul 2026 01:21:13 +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 4grJxM5mFcz3fFL for ; Thu, 02 Jul 2026 01:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782955271; 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=B1GvESfBJZX33TWKuYb36xh8e+UZIjXYx0WxEwpGF+o=; b=bWIkgxka41xFEuIOD9bydSljXOqLtkz55MsnuXpKB0KmnVr5RSzOeFgQiINQlgKp/qUjn4 af5AtyTze/qBlFl/kThsvkoWHcOqaqH9mwDZ84YSvMXACLOeMuWzFjmlx+3eAT6T/3IM72 zVmk67SkoFhDM0hta12b1DPvpkbStAgPJazQIoMXPcaHy9rJqTGxpJVSoaUrsvoreMZBne VpSgRfq9v2bTnzWcGHqYpx3Lx42prPd+fu65LbK1jKNaGMEZoJnmvN64pvHs5b6A3DYMHn VbC36cTAMrB8sVCINThge52OWyB21iIwupva3l+ZNX2+a4BCRVX7TuuwiHh0sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782955271; a=rsa-sha256; cv=none; b=fbrTdyfKJiuV4CwRioRINmRo7xP+Zm5vmiVcJLHGy5/xHO1QSy7I93MnKkDZIt1OgJCnPB wzWuejYalIReZmmog8rxKe2rOJMufLQcdKcIEYRYFkGlmKSl96m0xusfFgTmJzpUWft6VU LCbaAdWHgxSyedB3goPfvDSsDIyJV6vl7Lq/GSUmPkGmlNSF65TezKUZ1B5mxJiXVQyaic aWF4ijSz1j8Lb3k4xkBq+8JwTSwDKF/yUVmKBvUi2aAyzU7AV5QzCOlld/GjuhuyU7remx Ej6WxI5Jpx0EprA0rH1DwwoIkj4SIQSRLAVPG7HU/XpuMGPyFSqVrl6rId2cug== 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=1782955271; 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=B1GvESfBJZX33TWKuYb36xh8e+UZIjXYx0WxEwpGF+o=; b=PnNuhcruviSQNAiRwxGBYHKRyELvG+j51f6gR4pNtsyCCcUuc79/NDGhzvWdNEvJAHmp0J wWBZ+7tIsnLmrY6DtZYbcVavJBTeW2VbLbFBkyYsgIxvllr/Y2L5iFagyzQIUrSIOfQXEi 63Kc2I6VaT8fN8XPVv10DVNu1s0vxoP3POzmaXUHm/COZdScc1ks2O5E4y8o1CpOGgHenI 4UsrBdmg+izjw8/fVrV2CTlPrlR2m7kxuA6BrA62Oc1fdw4LP4FFqTibLtzObGqZ8MV7xX WF9dse+o1SPSAHLGsQUysGrke9FA3UYF+C8OiStNDh7n6RlolEhKFMY6cj5HQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grJxM4VkkzgT0 for ; Thu, 02 Jul 2026 01:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3291d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 01:21:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 0b9f4c6b0a03 - stable/14 - nfs_nfsdserv.c: Fix setting of birthtime for some ZFS pools 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b9f4c6b0a03df1522bba415b67d875a1e73f811 Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 01:21:11 +0000 Message-Id: <6a45bd07.3291d.615092fe@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9f4c6b0a03df1522bba415b67d875a1e73f811 commit 0b9f4c6b0a03df1522bba415b67d875a1e73f811 Author: Rick Macklem AuthorDate: 2026-06-18 15:45:27 +0000 Commit: Rick Macklem CommitDate: 2026-07-02 00:19:24 +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 (cherry picked from commit b1af05406b5117d76f567056fba0a023a6374465) --- 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 8d4501a286cc..3a5c45bacda8 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -545,6 +545,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); }