git: c3c13035ef27 - releng/13.1 - zfs: Fix an improperly resolved merge conflict

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Tue, 01 Nov 2022 20:55:22 UTC 
The branch releng/13.1 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c3c13035ef270dcf0d24d2d847dd590edc535ed0

commit c3c13035ef270dcf0d24d2d847dd590edc535ed0
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-11-01 20:54:33 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-11-01 20:55:10 +0000

    zfs: Fix an improperly resolved merge conflict
    
    Approved by:    so
    Fixes:  8838c650cb59 ("Fix use-after-free in btree code")
---
 sys/contrib/openzfs/module/zfs/btree.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/contrib/openzfs/module/zfs/btree.c b/sys/contrib/openzfs/module/zfs/btree.c
index 77cb2543e93d..09625bc92f92 100644
--- a/sys/contrib/openzfs/module/zfs/btree.c
+++ b/sys/contrib/openzfs/module/zfs/btree.c
@@ -1766,7 +1766,6 @@ zfs_btree_remove_idx(zfs_btree_t *tree, zfs_btree_index_t *where)
 	zfs_btree_poison_node_at(tree, keep_hdr, keep_hdr->bth_count);
 
 	rm_hdr->bth_count = 0;
-	zfs_btree_node_destroy(tree, rm_hdr);
 	/* Remove the emptied node from the parent. */
 	zfs_btree_remove_from_node(tree, parent, rm_hdr);
 	zfs_btree_node_destroy(tree, rm_hdr);