From nobody Wed Aug 13 20:05:28 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 4c2K9j03YSz64RRP; Wed, 13 Aug 2025 20:05:29 +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 4c2K9h6PnBz3LTf; Wed, 13 Aug 2025 20:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755115528; 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=nmrFTwMOD6GQ6Oml1s/6FhPOgsCAKsojnFKe5VfwSWs=; b=pHfCSkmMZh9sKh8lsdwoy3z9eAuJkHnNO687b+FICXe6xvd9wrtBuzjqAZtq2eaFjB6vsu ZDpfoOjOEWdRhPHD9rmvsC56Uyeae3REMKY+BT7g5hKWm7zCEWdL28M663+CthWbdYM7OW V63f65ttdlA/FSNicvm9BcM6y2CZOhK7RvTcEDI8J2HJYRMO2+9tnnvSMglP/KdNs0YUtx 2ncQ5g+l0cdZJEqZ2nIbgfTum1woCq2YxhgedC4FaseiS+KM1m+9xnpZklEY+3msnEtzc5 ho0nZVZIYOz2nnup08ZaafRqakDUWYeoNhPOqeEzlVwWkra9a3/DyeyhXrjs7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755115528; 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=nmrFTwMOD6GQ6Oml1s/6FhPOgsCAKsojnFKe5VfwSWs=; b=SQE2X5Wq6MLJGwVu3y4GlTXpsEQ4NGkVNbiNopI7+Fl8E1QNNAcyTmciSEAiu2bPHd4MFu vxsZG2ORl9jNb09vPWh9qZIWySwlZOqbKrTh0UY35Z70dDURVyo0l5mbO6y4Fyaj5NC9sv ZrFH+fXQd4f5T2Qi8KsYEHbf9SETiX2Maqj0EJ/SSjbMwBBZdVIzuBk9a9oC9904evKi4s ATW5b2ebVrcFwn6eIkmRFujMnPM4v+eFj9fdGbXB1KMr5QLWsGFzqZMq+t/Oy/tVa2B80/ tXqeG2QOGJPmLjhB+DSlJRr0SUmHmAYZFvAWYJ6PPf/IImsBBrxHWc2R3WMDHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755115528; a=rsa-sha256; cv=none; b=DRyTMgXKYYS/EkEcwuOUpNgOPQmQ1UoFRs3fqEX1uFTmoewpczFXY7Q835/1iJs9QzOXGx C3KXicdGqzixfRRVxAMOD54a60+Slr30OT3HrmRwjkJFUI40N04cl8IaLgkgBr31SCIlZv LNcymR2psqeK93r/C0FwAffD86tj4hu5BAIp8oEKZYmewT92vfYQHT/jXtg6onhjZiH4Yo B0f1o7FAvJUA7eFH5BNzbk7b88tYAGQlS3FeuraOBMAP0D1FKmitfJOl6pAQ3Un7Gk2U2p pLkdTdTVndH+cZgUF5wKyqKiy0pWxGElTvT4tfH70vUiiAin/zFLBy+ba0BYGg== 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 4c2K9h5ZXRz6ml; Wed, 13 Aug 2025 20:05:28 +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 57DK5StB020392; Wed, 13 Aug 2025 20:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DK5S00020389; Wed, 13 Aug 2025 20:05:28 GMT (envelope-from git) Date: Wed, 13 Aug 2025 20:05:28 GMT Message-Id: <202508132005.57DK5S00020389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 503769f2a7f6 - main - Fix missed assertion update in physical rewrite patch 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 503769f2a7f665c7b9d59020e94064ee8c5365a1 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=503769f2a7f665c7b9d59020e94064ee8c5365a1 commit 503769f2a7f665c7b9d59020e94064ee8c5365a1 Author: Alexander Motin AuthorDate: 2025-08-13 20:01:44 +0000 Commit: Alexander Motin CommitDate: 2025-08-13 20:05:06 +0000 Fix missed assertion update in physical rewrite patch Physical rewrite patch changed the meaning of BP_GET_BIRTH(), but I missed update one of its occurences, ending up asserting equal logical birth times instead of equal physical birth times. PR: 288722 --- sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dsl_deadlist.c b/sys/contrib/openzfs/module/zfs/dsl_deadlist.c index 475db3c89508..41ac72bf1c16 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_deadlist.c +++ b/sys/contrib/openzfs/module/zfs/dsl_deadlist.c @@ -1049,7 +1049,8 @@ dsl_livelist_iterate(void *arg, const blkptr_t *bp, boolean_t bp_freed, ASSERT3U(BP_GET_PSIZE(bp), ==, BP_GET_PSIZE(&found->le_bp)); ASSERT3U(BP_GET_CHECKSUM(bp), ==, BP_GET_CHECKSUM(&found->le_bp)); - ASSERT3U(BP_GET_BIRTH(bp), ==, BP_GET_BIRTH(&found->le_bp)); + ASSERT3U(BP_GET_PHYSICAL_BIRTH(bp), ==, + BP_GET_PHYSICAL_BIRTH(&found->le_bp)); } if (bp_freed) { if (found == NULL) {