From nobody Sat Oct 03 17:34:57 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 4hxt822MXsz6vmcV for ; Sat, 03 Oct 2026 17:34:58 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hxt815rdtz4kyC for ; Sat, 03 Oct 2026 17:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791048897; 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=GRT+fIXwNp/QB7vunPFJ9zay896Rh+jtXjyF53E850c=; b=Cf3GGyiYn6UT8jbWPspbF0L/6tFaAold1mN0OzjgkDJKQgLvPr0rGoxKYQylfbnZf4TiH7 +wmt6NOp/3YhChOd/6Vza+aJTHvVmBAoJL6x6AtfnhkE5GzWitAb5kjF3B8rxMXG3KeaRb zzmqomNy4V3ldRZhQFWwO6nNT1jmQB/cwZh+McXq0ktcBWsLRRtN1YRIyuOgs52wT8DtJs xkp8helpq+lRz18IW3rCjzvI4xnW0pDIK3A9rpLPBt8Xmfry8WIDHNwAQf9F8yTl23H9J8 jDma2Ba+3FNrSTk8NvwfXx2Moqn4L7yALCzrMT4FV24x8yJ7M25xrezegkuTvg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791048897; b=wbGJrYLcsrXKdKvqgMJvJ/3eDO5C5VdW95QVHKrNhcujKqo+CN1kZy+JAIlggM39b/bR2G LIhBneOGtCK1Er/pvS8tvlz7rBvBJyYb17TRxsrn6gVJi9F/yztEHTfoxsXCRtiUOC12tT 3uaJUqQK1Ng3vzV7/N31zLodgNILizBf6q4siZUmphp5nAiMsXaq+GoysU/KwNprYsOqrs TawiWQ46dYf5EK9IwaZb0RQmcT1fc864tMsZOJBdwGQjhuL6VA/pFj1diTTk/s1Hj0WzRZ UsZL2ZWtFr7qAI+9C4nJzRnVAcQpF+/+fCWckFL179uqYUYmaF6qgiuTJ/5SIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791048897; 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=GRT+fIXwNp/QB7vunPFJ9zay896Rh+jtXjyF53E850c=; b=EXVz2hOAxFTxJjrkySy3vGxVQ1s+VZSuZXxFS5lZAQe5ENCpgYOURH8QueLOiAwl9QNDfE mYW0Qd6WhTxNeTVWNCYd9g2wd+qc5D9DTV7yV3xEbbNHYiIJ5gBYkqXdt5E9O8ACbkjj/c jgEXz1U4bbSB5bsg1+MP/CZOgR36CzmYJslCox78u7EFTcp6Rmti6kUYhRR41QBxN1wCry aTK9gZQd7MkjqqQn4C1jNnhbSzH2IHo3Kjpt+86QEW3VcGylx9TGl1LPzQzXh/y8i7hMwF bWTimAfI2TkPHswNNNUUTu0LYGOmZC+0bJrN+dulF0zO7MwbQ7S0cT+DS5Db3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hxt814dJfz1CNr for ; Sat, 03 Oct 2026 17:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 17:34:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f382ef1dc82c - main - stand: update zfs_dnode_stat to use zfs_dnode_sa_lookup 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f382ef1dc82cf0679b164be1e6cce51c022a204c Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 17:34:57 +0000 Message-Id: <6ac13cc1.1f0d6.2deb77e3@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f382ef1dc82cf0679b164be1e6cce51c022a204c commit f382ef1dc82cf0679b164be1e6cce51c022a204c Author: Warner Losh AuthorDate: 2026-10-03 14:42:53 +0000 Commit: Warner Losh CommitDate: 2026-10-03 17:32:08 +0000 stand: update zfs_dnode_stat to use zfs_dnode_sa_lookup Find the SA values with the zfs_dnode_sa_lookup and read out the relevant bits for the stat buffer. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60267 --- stand/libsa/zfs/zfsimpl.c | 54 ++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 1eb1923fac49..a13f8d805049 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -3958,44 +3958,22 @@ zfs_dnode_stat(struct zfsmount *mount, dnode_phys_t *dn, struct stat *sb, sb->st_gid = zp->zp_gid; sb->st_size = zp->zp_size; } else { - sa_hdr_phys_t *sahdrp; - int hdrsize; - size_t size = 0; - void *buf = NULL; - - if (dn->dn_bonuslen != 0) - sahdrp = (sa_hdr_phys_t *)DN_BONUS(dn); - else { - if ((dn->dn_flags & DNODE_FLAG_SPILL_BLKPTR) != 0) { - blkptr_t *bp = DN_SPILL_BLKPTR(dn); - int error; - - size = BP_GET_LSIZE(bp); - buf = malloc(size); - if (buf == NULL) - error = ENOMEM; - else - error = zio_read(mount->spa, bp, buf); - - if (error != 0) { - free(buf); - return (error); - } - sahdrp = buf; - } else { - return (EIO); - } - } - hdrsize = SA_HDR_SIZE(sahdrp); - sb->st_mode = *(uint64_t *)((char *)sahdrp + hdrsize + - SA_MODE_OFFSET); - sb->st_uid = *(uint64_t *)((char *)sahdrp + hdrsize + - SA_UID_OFFSET); - sb->st_gid = *(uint64_t *)((char *)sahdrp + hdrsize + - SA_GID_OFFSET); - sb->st_size = *(uint64_t *)((char *)sahdrp + hdrsize + - SA_SIZE_OFFSET); - free(buf); + uint64_t value; + size_t size; + int error; + +#define SA_STAT(attr, field) do { \ + size = sizeof(value); \ + error = zfs_dnode_sa_lookup(mount, dn, attr, &value, &size); \ + if (error != 0 || size != sizeof(value)) \ + return (error != 0 ? error : EIO); \ + sb->field = value; \ +} while (0) + SA_STAT(ZFS_SA_MODE, st_mode); + SA_STAT(ZFS_SA_UID, st_uid); + SA_STAT(ZFS_SA_GID, st_gid); + SA_STAT(ZFS_SA_SIZE, st_size); +#undef SA_STAT } /*