d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: Fix an improperly resolved merge conflict

Browse Source 
Approved by:	so
Fixes:	8838c650cb ("Fix use-after-free in btree code")
This commit is contained in:
Mark Johnston 2022-11-01 16:54:33 -04:00
parent e81b1bd17f
commit c3c13035ef
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/contrib/openzfs/module/zfs/btree.c
View File

@ -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);