On Fri, May 29, 2020 at 12:18:23PM +0100, fdmanana@xxxxxxxxxx wrote: > @@ -1103,23 +1128,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, > > mutex_unlock(&fs_info->chunk_mutex); > > - ret = remove_block_group_free_space(trans, block_group); > - if (ret) > - goto out_put_group; > - > /* Once for the block groups rbtree */ > btrfs_put_block_group(block_group); > > - ret = btrfs_search_slot(trans, root, &key, path, -1, 1); > - if (ret > 0) > - ret = -EIO; > - if (ret < 0) > - goto out; > - > - ret = btrfs_del_item(trans, root, path); > - if (ret) > - goto out; > - I get conflicts in this hunk when applied to misc-next. The merging tool 'wiggle' can handle the rest of the patch and leaves this as the unresolved conflict: 1154 <<<<<<< found 1155 ret = remove_block_group_item(trans, path, block_group); 1156 ||||||| expected 1157 ret = btrfs_search_slot(trans, root, &key, path, -1, 1); 1158 if (ret > 0) 1159 ret = -EIO; 1160 ======= 1161 >>>>>>> replacement
