From nobody Wed Aug 20 14:53:43 2025 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 4c6Twm0sV9z64Xkv; Wed, 20 Aug 2025 14:53:44 +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 4c6Twl5cHRz3mQM; Wed, 20 Aug 2025 14:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701623; 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=OaC7b+xNVKZhgZ6w+vXF/ocH3cA8oOk+FLA6xcjbsew=; b=ZU0eL6qcRliWwmO2LDTvfWPpe3g255ZT58rDpzUi31IivC78/VlvgH8vEyvGwdaiIkgM0z qIOrqwtBGXHHSawMoO+1zw00njxNABgdA/lAO17nrkH8K+L/nIE+GlzODRa3hYqWMWPuSK Z5Hcsf3HDWtd+c/wjVi/F3Gu4Ypf0kw51ifepcCb39qdRtC1odErzjGWPmEkBbjLbeyvFN LnM3PdZynMifiFinLJY2+zGOrSJpmjd/1uuw76+0HdpFBCm9VVA5EoACQIZSGq3NAeQ2DU IcM5ZVMpcLKf4X9l+RgUvAj7rs+ASjdzdlClqSVMVm4yn8RSoCpqJxYWfP45oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701623; 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=OaC7b+xNVKZhgZ6w+vXF/ocH3cA8oOk+FLA6xcjbsew=; b=CDUvQuZ5Sdi5HFz4Ue7Ax5lv86ZApOUAto2rSGxRbq7j9kZaiO5sCNoLpS8k+mILYuoVan 2l9u/vh1ZGyOzu6O7VAkX0gBdHH/ndt2SLdG/2ydM5dCxPLpNzhTszuFEof+dIMWRc9QbH 26F4G6s1V+iiuZ3vNbsE0Zfc0Yl5IqGTVIrUckPx1ZItO5TeaAvoFRWQLj3Vf1SDD10L3g /KUZsVsxNlyhjZF4vHur2uKl/0I1asyNrgkJPL4edIgupa/islnd89M8R22kPm1ph09Jq7 r33hy3uCufTsHUpw6QUZt6d11o+s8XZgeilpkcGOIuHgLJgAqHx1iSJrvjFoiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701623; a=rsa-sha256; cv=none; b=aw9kmP++sEjflF9C3CuLlmfa0HRnCmsIxlYiwUc43ejiDaxK6QdVgbbVvtY82KilEXKW/7 GCpi81qWj8fIhnzhvC5MqAS9hqFbqdlb9P/2IWJZgnY99Aw0ROtvmdNV3QGkkPxNglvP9V fN2HkzqyKNHAubJ+quvrDbGvRJnnTn1ujd9I7Ob7rm/6gSAWr+TvMDiFFfTbzTj0+1vSHG sfRSsVeCGJ44Roop4BAHonW0RvRAtcCVPODMBm2TOm93Zb4HqzjuPl5+y/T8AXBgXcfa/u bvrNSzMxhw44di1UAhMzeMo7MbN857UKyGJkUahOPXBX3bVwsIvjZBjmbI+PHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6Twl5DBZz30k; Wed, 20 Aug 2025 14:53:43 +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 57KErhIC028623; Wed, 20 Aug 2025 14:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErhYv028620; Wed, 20 Aug 2025 14:53:43 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:43 GMT Message-Id: <202508201453.57KErhYv028620@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: fe2418f26ed0 - main - libsa/zfs: inline vdev_init_from_label() into vdev_probe() 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 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: fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 commit fe2418f26ed0b2b9e06152c16f72f2bb4ec27c29 Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:53:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:53:20 +0000 libsa/zfs: inline vdev_init_from_label() into vdev_probe() This function is used only once and also pulls three variables from the nvlist that the only caller have already pulled out. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D52031 --- stand/libsa/zfs/zfsimpl.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index bc960a1fe3c0..f15d9b016068 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1171,30 +1171,6 @@ done: return (rc); } -static int -vdev_init_from_label(spa_t *spa, const nvlist_t *nvlist) -{ - uint64_t top_guid, label_guid, txg; - nvlist_t *vdevs; - int rc; - - if (nvlist_find(nvlist, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, - NULL, &top_guid, NULL) || - nvlist_find(nvlist, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, - NULL, &label_guid, NULL) != 0 || - nvlist_find(nvlist, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, - NULL, &txg, NULL) != 0 || - nvlist_find(nvlist, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, - NULL, &vdevs, NULL)) { - printf("ZFS: can't find vdev details\n"); - return (ENOENT); - } - - rc = vdev_from_nvlist(spa, top_guid, label_guid, txg, vdevs); - nvlist_destroy(vdevs); - return (rc); -} - static void vdev_set_state(vdev_t *vdev) { @@ -2079,7 +2055,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, vdev_t vtmp; spa_t *spa; vdev_t *vdev, *top; - nvlist_t *nvl; + nvlist_t *nvl, *vdevs; uint64_t val; uint64_t guid, pool_guid, top_guid, txg; const char *pool_name; @@ -2230,7 +2206,15 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, return (EIO); } - rc = vdev_init_from_label(spa, nvl); + if (nvlist_find(nvl, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST, NULL, + &vdevs, NULL)) { + printf("ZFS: can't find vdev details\n"); + nvlist_destroy(nvl); + return (ENOENT); + } + + rc = vdev_from_nvlist(spa, top_guid, guid, txg, vdevs); + nvlist_destroy(vdevs); nvlist_destroy(nvl); if (rc != 0) return (rc);