The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2165931f74f5b1cbb8f0dee4b5764b694170a5ec
commit 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Author: Martin Matuska <[email protected]> AuthorDate: 2024-03-18 11:44:52 +0000 Commit: Martin Matuska <[email protected]> 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;
