From nobody Mon Mar 18 13:44:41 2024 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 4Tyx153TF8z5Dlp7; Mon, 18 Mar 2024 13:44:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyx1530SZz4L8p; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; 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=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=S0X2EouJpmJWueCeNurMA0uMMnnsOjf6+PaHyWMW4EoiVu1ZuWUuoRDZ4U86LuW5PPf/8D Z5nKCMgslilALaLMqkeuotFtdm/tVF4qkX20ZqgvZH1eKklfyIpzsxoNf3WwbRYp/z9kGe pOMPYxl/G3OmC7NZAHlJ83ctkIoxJ+aezNOJoA5mdCM3KF0a2oxI1xIYa8O8d/3czDCKb0 ytzATYIC7qpr5/zJVKH+afRBIwXrLbIeHVQhFK6wvIDksyPDcF5z/I0mFpyB3+tkBeveu1 9STAsbOrls7RsMB/hd8LyRftVbJkNMT4g1MtGmy30Pk8MbtiEIsGnWY0TeVhqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710769481; a=rsa-sha256; cv=none; b=euG5h520CXH4pFosku6hNAh1J4D0G7R0hemP1f9+64bTn3Sc8Xy3EAFvuVbZ/aZnDldz+n od2JfCt185LJm3fgTT5YPykAkRdjpsCZqabddTxd9Yrh9qfM/xz63oe+d6HUclI+cBTGZO lVLN234IW5+sq55JbKiOBvUTdudd6mbSYNfzhraSn34wIveHl9qRNEEZAAR9F+sx1brZV4 enhqimWwFIUFUBoZG9/KpzAIFmjkadHIsVvGT4zg2iC1SZEgzdCaXkmedG74Ot6pGPhyx/ XVjT8Y2RQzbCW48J+ICuwgTBJoCRWNghB0ZMCf005mSf6ze11YRFM/T1GuvzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; 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=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=Si2/LYp4H06hVlpz2XM28T96goEZ+XYd+QNmeW+3IvvlSjeQ1IjfkRat0l12nkG/iXarOa vwmywFj6kzZqE0kKo3SbgZPxikGsbug84oYK9pmQaAG82tynSDtfHF7PsPbSvK2uy07eH3 wPwKhOAFjhHEZ7m9q2bKnJfV8YXK94sljv94JlzdOqwUeuhhXomNpejvpJf6vILWHbIl8L 5K9BUGpvCwp44x9oBDYtyJNuc4t9Imt94iY0FvD2BaTNnWtMbvE28U1OLa4ZWaZ/XihI5f pl4tc77ind6fdR/Io6mog9YeJmYke3hTd+EU2uFv1w9devzw2neHWngvCaCNmQ== 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 4Tyx152c1VzQ3F; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IDif7W080042; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDifKr080039; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:44:41 GMT Message-Id: <202403181344.42IDifKr080039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2165931f74f5 - stable/14 - zfs: fix NULL assertion in dbuf.c 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2165931f74f5b1cbb8f0dee4b5764b694170a5ec commit 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Author: Martin Matuska AuthorDate: 2024-03-18 11:44:52 +0000 Commit: Martin Matuska CommitDate: 2024-03-18 13:43:58 +0000 zfs: fix NULL assertion in dbuf.c When porting from OpenZFS master 86e115e to OpenZFS 2.2.x 9c40ae0 an assertion in dbuf.c was converted improperly. This is a direct commit to stable/14. OpenZFS PR: 16005 Differential Revision: https://reviews.freebsd.org/D44404 --- sys/contrib/openzfs/module/zfs/dbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index 280001bc34b6..6e983093fb97 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -1923,7 +1923,7 @@ dbuf_unoverride(dbuf_dirty_record_t *dr) zio_free(db->db_objset->os_spa, txg, bp); if (dr->dt.dl.dr_brtwrite) { - ASSERT0(dr->dt.dl.dr_data); + ASSERT(dr->dt.dl.dr_data == NULL); dr->dt.dl.dr_data = db->db_buf; } dr->dt.dl.dr_override_state = DR_NOT_OVERRIDDEN;