From nobody Sat Oct 03 17:34:52 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 4hxt7y36bdz6vmcC for ; Sat, 03 Oct 2026 17:34:54 +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 4hxt7x3rYbz4kxg for ; Sat, 03 Oct 2026 17:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791048893; 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=b354oIsrE4RlreuYqv4OQKYMH8A6zgjZUopPjMo2d3c=; b=rtk3iN8pCGC9BAJ0KBcxpE7eHT88uZIiqsCMR7FB2+YY1wQlLUcKK+m5ZRrVQ47/NR6A5F GQV1RSOMkfoL2FdR2V1VtSIqSMAQ2DIjT/QEutAK47TBAobrJFZkMQtpgU82eS7cIBXxlE fGDzTmPzrj4WWyF++K+gvAwWgZAXMf6RPPp1+q3hvNifr+Vstvc9HVvgr8Ejeh0BdbEw8Q r6i4BNwdnczvV12UakxWsjZ3xGAoiKt6Xcd9NoXQiN1nFggSFOrH+6TFMB3leW2wXdY+pA EV3ax8OOudXmF+0TnQVTY7Orh0aIxgY34Z3JRts1gWRFIry1lyd++6ZSJJSYNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791048893; b=SRiuiIX5FCtmCxGsVLvGjYtHZ2LHhlqn37xSiztEqNaLfkh4RNcUBsg84jmLQhy+Oz9AMk dwQQBevqdxiie/PEXqroKmmJBtnmmjIV00G3uWiNGPGN1vetrtx6ZkuYWbDLE3QE9+vL+f 3AxV5GaJyP+Z+5izQpxs7r2I1paLDebk3LbG68YhKYqs4xrB4YT4xXhEZReFOVGRJ5/HVm xU18x9J+5kSDrmTb6IFpTkelB/pcEJpkiwnpb3N7ZPV+bxcV8lo0i6FUPjItB2RPv9DJce 2R8Z4jXT3pioRoTn/aBNPZy9ct5aBjbttS+VfzJkJE1AAaLaQC55URKa0w2D9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791048893; 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=b354oIsrE4RlreuYqv4OQKYMH8A6zgjZUopPjMo2d3c=; b=BXAoe/wVXKLYVbrYrJE22HG6EWxTDRSNcPGXza1NNpHdnneYPxntcsrHgLqw5ZoCbFxhc1 BdPgGRE5Bz41gJuGxb5ERyPJkpOn1QXS6ui2LYyXEOjC+uXPDrP6p552d/6W11cRvQ26Yv 2U0/In71jiULoj9+p976RYP1UXkWx21mLH02gi/up/VcwGZ+RouHdGqkiScLX656jynGuJ Qe7jY7MRjmGy+LMnswAIeHYdHamLnKKitHj7gmPENPt/3bOFndxMUFWPRQ8WyqtJIfKpDx wjkIRrda26HVAxBBCe3881yABbaxJHS1mlgqNiVDRJV/ASYuGyIj6iK+hmz5xA== 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 4hxt7w1zzXz1C62 for ; Sat, 03 Oct 2026 17:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 17:34:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ecd41c0df3a0 - main - stand: zfs_dnode_stat move from spa to mount argument 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecd41c0df3a0e5f98716c5aabbdeb36c2c29b86f Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 17:34:52 +0000 Message-Id: <6ac13cbc.1fa03.28b463ad@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ecd41c0df3a0e5f98716c5aabbdeb36c2c29b86f commit ecd41c0df3a0e5f98716c5aabbdeb36c2c29b86f Author: Warner Losh AuthorDate: 2026-10-03 14:42:21 +0000 Commit: Warner Losh CommitDate: 2026-10-03 17:32:07 +0000 stand: zfs_dnode_stat move from spa to mount argument When reading dynamic system attributes, we'll need the mount argument since we can no longer hard-code the offsets. Adjust zfs_dnode_stat to take it. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60261 --- stand/efi/boot1/zfs_module.c | 2 +- stand/libsa/zfs/zfs.c | 2 +- stand/libsa/zfs/zfsimpl.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stand/efi/boot1/zfs_module.c b/stand/efi/boot1/zfs_module.c index 3c3e9f6a1015..1d6d71127f29 100644 --- a/stand/efi/boot1/zfs_module.c +++ b/stand/efi/boot1/zfs_module.c @@ -217,7 +217,7 @@ load(const char *filepath, dev_info_t *devinfo, void **bufp, size_t *bufsize) } /* Only st_size is inspected here, so identity is irrelevant. */ - if ((err = zfs_dnode_stat(spa, &dn, &st, 0, 0)) != 0) { + if ((err = zfs_dnode_stat(&zmount, &dn, &st, 0, 0)) != 0) { printf("Failed to stat '%s' on pool '%s' (%d)\n", filepath, spa->spa_name, err); return (EFI_INVALID_PARAMETER); diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index 156c78d6869c..5241bdc19716 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -218,7 +218,7 @@ zfs_stat(struct open_file *f, struct stat *sb) struct zfsmount *zm = dev->d_opendata; struct file *fp = (struct file *)f->f_fsdata; - return (zfs_dnode_stat(zm->spa, &fp->f_dnode, sb, zm->fsid_guid, + return (zfs_dnode_stat(zm, &fp->f_dnode, sb, zm->fsid_guid, fp->f_objnum)); } diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 123aadc37b53..d4ebb2cfdea8 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -3713,7 +3713,7 @@ zfs_spa_init(spa_t *spa) } static int -zfs_dnode_stat(const spa_t *spa, dnode_phys_t *dn, struct stat *sb, +zfs_dnode_stat(struct zfsmount *mount, dnode_phys_t *dn, struct stat *sb, uint64_t fsid_guid, uint64_t objnum) { @@ -3749,7 +3749,7 @@ zfs_dnode_stat(const spa_t *spa, dnode_phys_t *dn, struct stat *sb, if (buf == NULL) error = ENOMEM; else - error = zio_read(spa, bp, buf); + error = zio_read(mount->spa, bp, buf); if (error != 0) { free(buf); @@ -3933,7 +3933,7 @@ zfs_lookup(struct zfsmount *mount, const char *upath, p = q; /* Only st_mode is inspected here, so identity is irrelevant. */ - if ((rc = zfs_dnode_stat(spa, &dn, &sb, 0, 0)) != 0) + if ((rc = zfs_dnode_stat(mount, &dn, &sb, 0, 0)) != 0) goto done; if (!S_ISDIR(sb.st_mode)) { rc = ENOTDIR; @@ -3959,7 +3959,7 @@ zfs_lookup(struct zfsmount *mount, const char *upath, * Check for symlink. */ /* Only st_mode is inspected here, so identity is irrelevant. */ - rc = zfs_dnode_stat(spa, &dn, &sb, 0, 0); + rc = zfs_dnode_stat(mount, &dn, &sb, 0, 0); if (rc) goto done; if (S_ISLNK(sb.st_mode)) {