From nobody Fri Jul 11 03:20:36 2025 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 4bdcRT3Zn8z61w2J; Fri, 11 Jul 2025 03:20:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdcRT08wfz3ndL; Fri, 11 Jul 2025 03:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752204037; 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=l1BssYPPDdsIBYFMsBfiicmPgjWdWKw4cRr1rVwv32U=; b=YMZG+ItSU6B3o5Wre1DnoCutDsw3OnT8c25hGy+h9cZauugEPisdJaU93PKDi47xqgHJeG ugZiATFH5gW2RG090NqeB24OzUm2RdtisovvQTgDp1lc4zIwHcGQ8vNQQzhjKOzEun52Pn sgaBdcSv49n98w/wUBMcxKa6J3W78YooMiaFKiUp7/DMzFnxDjZpeyfG3wm0AeLQls3bNr 1lgKP8O6FVeojBgEhr47C122sEpe45GkgeMzFONefqKIz2FqpPns5vroqkgLYlIPbwnNBk LlFTIgAIf+nvKnoUZH49WeVyOY5ILNZAUqA9kx1L1Qy+ZjyVqfksOAXJH46yqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752204037; 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=l1BssYPPDdsIBYFMsBfiicmPgjWdWKw4cRr1rVwv32U=; b=VMGmeFXvEVnGreDbJAWhXHBJENlImtBwmxPHs60S71Kj46NxU13xMbxMYqbvIS4745VcOL ggClCU8TQJAO2vEbebrz72u7wqvsrs+XV1krf2HqjVS5N2o0ALuVrfa2yLushp4JL+qBpj ESxXmUf5FGpQMRILRh1b7dVAj7gCtPppit/XaH+maMHbqAidYwhuX06SGC8B7RXrxSEV05 7Us8CYwIgPQdJigAA6YumE+1JKbLdyGqYXWDKvyUjmupsCLq0b65ZXdTQ3OS0lEvPapx1T LKh+mwgkRhuz1zyFGmsAcl5+aRnGQCthU3pVuYWlAYegk+0ZTYXft3JZiZI86A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752204037; a=rsa-sha256; cv=none; b=IQGkHRj7TNYYXTxl6g3yvI+rhDGnvMTucS83yaiozFeM1+zJNbok9YV9LA2WJ/wzmSINay YcL3xp+uaCkflgrQToOPT5FSGNxHNGrGJVd4X4xd1UBUEuTNLpgmobtlvSpuIFTYE2xXXu VWJNDXnVtumJKkSn9N1WuhBg+/BEqIczUXIi6zO+FaRO8tHp2GSK6XT/nQFVeInC92HS9S mSxmiSw2rwyi2GReS/N5f1RQamaZ7PDZlVAxTBPglFSAsobWhlD4nlxRCZVVx078KoeOO+ j/5oY7k9OwmM1F5SrKiyljTQ/+hn6E7uku0iZNYaqzElaGwDAKFGUjJW+4O5mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdcRS6p4Xz4kn; Fri, 11 Jul 2025 03:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56B3KaYB033248; Fri, 11 Jul 2025 03:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56B3KalL033246; Fri, 11 Jul 2025 03:20:36 GMT (envelope-from git) Date: Fri, 11 Jul 2025 03:20:36 GMT Message-Id: <202507110320.56B3KalL033246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8949cdd9af53 - main - libsa/zfs: don't read and store ZPOOL_CONFIG_VDEV_CHILDREN in vdev_probe() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8949cdd9af536d3fc4313c057dcb383f474c3f84 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8949cdd9af536d3fc4313c057dcb383f474c3f84 commit 8949cdd9af536d3fc4313c057dcb383f474c3f84 Author: Gleb Smirnoff AuthorDate: 2025-07-11 03:18:36 +0000 Commit: Gleb Smirnoff CommitDate: 2025-07-11 03:18:36 +0000 libsa/zfs: don't read and store ZPOOL_CONFIG_VDEV_CHILDREN in vdev_probe() This is just the value from the current label and it is not used in the function. Later zfs_spa_init() will call vdev_init_from_nvlist() and it will obtain the value. --- stand/libsa/zfs/zfsimpl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 058907b1d822..a31fa24f358e 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -2006,7 +2006,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, vdev_t *vdev; nvlist_t *nvl; uint64_t val; - uint64_t guid, vdev_children; + uint64_t guid; uint64_t pool_txg, pool_guid; const char *pool_name; int rc, namelen; @@ -2083,8 +2083,6 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, if (spa == NULL) { char *name; - nvlist_find(nvl, ZPOOL_CONFIG_VDEV_CHILDREN, - DATA_TYPE_UINT64, NULL, &vdev_children, NULL); name = malloc(namelen + 1); if (name == NULL) { nvlist_destroy(nvl); @@ -2098,7 +2096,6 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, nvlist_destroy(nvl); return (ENOMEM); } - spa->spa_root_vdev->v_nchildren = vdev_children; } if (pool_txg > spa->spa_txg) spa->spa_txg = pool_txg;