Re: [PATCH 5/5] btrfs: restart snapshot delete if we have to end the transaction

David Sterba
2020-03-20T19:40:00Z

On Fri, Mar 20, 2020 at 02:34:36PM -0400, Josef Bacik wrote:
> @@ -5377,6 +5392,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
> }
> if (block_rsv)
> trans->block_rsv = block_rsv;
> + goto again;

This hunk does not apply cleanly and there's no block_rsv around in
current misc-next + this series. I get this as automatic merge
resolution but that's obviously wrong and I don't see how can I fix it.

3166 ret = add_to_free_space_tree(trans, bytenr, num_bytes);
3167 if (ret) {
3168 btrfs_abort_transaction(trans, ret);
3169 goto out;
3170 }
3171
3172 ret = btrfs_update_block_group(trans, bytenr, num_bytes, 0);
3173 if (ret) {
3174 btrfs_abort_transaction(trans, ret);
3175 goto out;
+ 3176 goto again;
3177 }
3178 }
3179 btrfs_release_path(path);
3180
3181 out:
3182 btrfs_free_path(path);
3183 return ret;
3184 }

So I guess it's because of some other patches in your tree. I'm about to
push misc-next with patches 1-4, so you can have a look.