From: David Sterba <dsterba@suse.cz>
To: Josef Bacik <josef@toxicpanda.com>
Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH 5/5] btrfs: restart snapshot delete if we have to end the transaction
Date: Fri, 20 Mar 2020 20:39:27 +0100 [thread overview]
Message-ID: <20200320193927.GH12659@twin.jikos.cz> (raw)
In-Reply-To: <20200320183436.16908-6-josef@toxicpanda.com>
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.
next prev parent reply other threads:[~2020-03-20 19:40 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-20 18:34 [PATCH 0/5][v2] Relocation and backref resolution fixes Josef Bacik 2020-03-20 18:34 ` [PATCH 1/5] btrfs: reorder reservation before reloc root selection Josef Bacik 2020-03-20 18:34 ` [PATCH 2/5] btrfs: restart relocate_tree_blocks properly Josef Bacik 2020-03-20 18:34 ` [PATCH 3/5] btrfs: track reloc roots based on their commit_root bytenr Josef Bacik 2020-03-20 18:34 ` [PATCH 4/5] btrfs: do not resolve backrefs for roots that are being deleted Josef Bacik 2020-03-20 18:34 ` [PATCH 5/5] btrfs: restart snapshot delete if we have to end the transaction Josef Bacik 2020-03-20 19:39 ` David Sterba [this message] 2020-10-28 22:51 ` Holger Hoffstätte 2020-11-20 8:48 ` Holger Hoffstätte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200320193927.GH12659@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox