diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2022-11-01 23:54:33 +0300 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-11-01 23:55:10 +0300 |
| commit | c3c13035ef270dcf0d24d2d847dd590edc535ed0 (patch) | |
| tree | f6582d69009a70d8ae8b52e00da4cabe6d159fb7 | |
| parent | e81b1bd17fb4e83865d60461c2554d90f72cd395 (diff) | |
zfs: Fix an improperly resolved merge conflictreleng/13.1
Approved by: so
Fixes: 8838c650cb59 ("Fix use-after-free in btree code")
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/btree.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |