From nobody Thu Jul 2 01:15:44 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 4grJqC2d5Hz6l0Ln for ; Thu, 02 Jul 2026 01:15:51 +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 4grJqB2XbPz3dZb for ; Thu, 02 Jul 2026 01:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782954950; 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=EEvxo2rq6w+AKKpUWS9IRSSBe5cxF4ubGIZJWA/0FNI=; b=SYz6+KOuBhms+V9OUBHx1UsUOB5JHme9p9aWgJ7d3YciiEC43oGfKawSgJW8r5iMUkFJrQ M4hkAjE9ffzB96NBBIlL/jYtWCrUwDv++9i4tDOAyAs2EWB8s4pwbb1B0BX6wLBoEXqgJF WlhyXtSKYPjUfaA7JYnYrzz1HcSLh099+HqxbWNiQXyFgStR7UFAw0+Z6sOQNT93LZcKKH Sy2yrnyPe6MdZ4wXItJ3/WQEC5AxM5wKY/4Ug8EsCmLcyz335/sxCHgaMz1bf6KSk+pg/v Gly16k+Tj5suvoxAYljg03mzVm0qb3mtsNr8X58gy98si41U+zaS1+GO1CZHYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782954950; a=rsa-sha256; cv=none; b=onuFC/V3YVuaX7BxDwm+UvDWdwZNsxB+TWx0qXn9wKCLUhwJAYTlu2hnI3YM3edOlMCifp qNZ5zpBRCjGKebZmzqr7TH7FWuHqUEVB32B0KvmJCgda5W7y13CtJSdTHvswwapUkvJB1V 4qSbV4kAp0gjpUtUdvz8CxrEasBQOnQjeqPho3EVu3aqpnllvP8C/d52Tf9Dy+itYhx68X YJYiQaEAUNs5TvNbaqKi9nuYLdm3VZ/Y7O3KTV+l+8NlqTowPa3kWY8D7tQnJjTRwMXhd4 6HhulEM4n/NzwOuiggn9w0Hs1LzNXfm585k/qDlU7qELbe4B4ZPr3gpStcCkLA== 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=1782954950; 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=EEvxo2rq6w+AKKpUWS9IRSSBe5cxF4ubGIZJWA/0FNI=; b=yINCoxZv+e7FT36tMeADIfQIqK8nQsTi0nDeJskZsVSc8OZtK9GoqKAy6tkQir7zIjr1ht ogVgv1fYt/MO7uu967hQj895QI7Vrt0RQ45CwjjwTeT+vnPERlMGj8+xCFMEDICHc9yj+V r7z/BmPmzZpKHqJMxP9md//gtBBBckRbpng02T0IAvkA7Cs6scSamHEdpNadXHb1oTDoOt n5xXmbT67AwVHZjQq1uKFlD7FCc9OjvEZQxPNn50dib80Y/YUWvzkJ5KpAT4oJYcOE9UWN JFKkeHnavkWBbfTa+XLRJA+Hud5DeOr2Qt9bsJUJ1TZYn72j4mIRotMTErJ0Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grJq96xHFzg7b for ; Thu, 02 Jul 2026 01:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 01:15:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 76badd25811e - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 76badd25811e9cbea84818c23004ff0d13157a4f Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 01:15:44 +0000 Message-Id: <6a45bbc0.30a75.40fee7cb@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=76badd25811e9cbea84818c23004ff0d13157a4f commit 76badd25811e9cbea84818c23004ff0d13157a4f Author: Rick Macklem AuthorDate: 2026-06-18 15:45:27 +0000 Commit: Rick Macklem CommitDate: 2026-07-02 00:13:49 +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 0124de2db93d..ef24f3362dce 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); }