From nobody Wed Aug 20 14:53:39 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 4c6Twg2GHRz64XW0; Wed, 20 Aug 2025 14:53:39 +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 4c6Twg1mLtz3m4r; Wed, 20 Aug 2025 14:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701619; 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=rMVWpbUU401KO2Dl8nfPzYUXvvZQ/bkvQ3aVjwTsENM=; b=y3L2kw/kXEg69yX+ic3J3lk/iG0z0M07Zg7X8LuYGL/nsV/nkd7aibCA89dIz1wsXtbTXN C/7vwog2XJ4+Q3RFAdwUbYZB3FAWqR77N89vjFsWKh6wP/7pJXZSD2oNWp5PMOaEJgKajO erXdluYYOqmZurb4yDEhIynF+nkq1gtxd0p2MkRXNeL6xAQfCfxTKDtLabXhlDADV+gkkE 96fgFLDDzkvATNPWANFK4aCt/S2ZJbAA2UAtnNmh4J+s7+T3hVLF3Z4AFHxMNMB2aQAPwz poKW/JJRlReE/khozUP2DXSI5T5OcrKmhLP3t03Kf6NYA54lcXXF7h/OIwhA0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755701619; 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=rMVWpbUU401KO2Dl8nfPzYUXvvZQ/bkvQ3aVjwTsENM=; b=LMygS/klYTx5s3F/IXk8EjtkZZ2vsOwRl4xbtX7i/MZWX+19xinz8on2MMQV46Lk8ftRUC sCWIYpkwT6C5edCY6vgWrABvggIsEOi7Am4/g8V4x76zU7sDEFlikU4r3OtgOPY0mVC3UA dP6jVDeCnYady6tHeq75AF8XfECBCxyoK44UH+rSNkf58yT0lqpT/w3Ry5TfIN6tXZLdum kNQwHvM4kyItEYsNKIBRL7pkO8R35Q4c5JsYtzhdY+Mx1a2QJNwdWp17kfUzZCiPdlRBnV y/WoyI98VlYFU74JApVHh9c8gxItFfSyNeZqhs3kN0WAYzbx/7IUFaShwzVYMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755701619; a=rsa-sha256; cv=none; b=ZDRJRRyUsOpX1agimNoqEWF2NlmTtYgnurEOhgWVmjfLjxyWOydA9xk91qTZQKXNhCWTgX Uv8s26tJevLg+94VsZjm4BbdvtzN+cJjBmyMX9t6+L8ILVeVV8dS5QeqT0+yuxvw/cpJpw ojMQ7kVi8n2pWUvJylRAvxGgyCBjSyt0ZaW8yGRhwdUyW3XtsAcz2JmRXthCf7q7Nhdz7b dJk6KGW0sthvqyElsNZXHOgoa+f5deeaB3JhW/73ZoE1nBwvRuop9BUp0ZuX1T0HoZ8n6v 1CyjSNjUCVGJD2N6Dk86tDkM32I3imC64XOsjfuCNUC1VeF53Jiy3t2iigjbxQ== 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 4c6Twg1JrCz2sh; Wed, 20 Aug 2025 14:53:39 +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 57KErdps028479; Wed, 20 Aug 2025 14:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KErd12028476; Wed, 20 Aug 2025 14:53:39 GMT (envelope-from git) Date: Wed, 20 Aug 2025 14:53:39 GMT Message-Id: <202508201453.57KErd12028476@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: de055556a0d1 - main - libsa/zfs: ignore labels with zero txg 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: de055556a0d18b0523f65fe0d5615723a8b4369b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=de055556a0d18b0523f65fe0d5615723a8b4369b commit de055556a0d18b0523f65fe0d5615723a8b4369b Author: Gleb Smirnoff AuthorDate: 2025-08-20 14:51:08 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-20 14:51:08 +0000 libsa/zfs: ignore labels with zero txg Zero txg means this vdev has been correctly removed from the pool. For reference see module/zfs/vdev_removal.c in OpenZFS. It calls vdev_label_init(vd, 0, VDEV_LABEL_REMOVE), and second argument there is the txg to write. Reviewed by: tsoome, mav, imp Differential Revision: https://reviews.freebsd.org/D51910 --- stand/libsa/zfs/zfsimpl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 0bf232710d7f..4bfb7d4179fb 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -2081,6 +2081,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, if (nvlist_find(nvl, ZPOOL_CONFIG_POOL_TXG, DATA_TYPE_UINT64, NULL, &txg, NULL) != 0 || + txg == 0 || nvlist_find(nvl, ZPOOL_CONFIG_TOP_GUID, DATA_TYPE_UINT64, NULL, &top_guid, NULL) != 0 || nvlist_find(nvl, ZPOOL_CONFIG_POOL_GUID, DATA_TYPE_UINT64, @@ -2090,7 +2091,7 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, nvlist_find(nvl, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, NULL, &guid, NULL) != 0) { /* - * Cache and spare devices end up here - just ignore + * Cache, spare and replaced devices end up here - just ignore * them. */ nvlist_destroy(nvl);