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/7] btrfs: just delete pending bgs if we are aborted
Date: Wed, 16 Jan 2019 15:59:20 +0100 [thread overview]
Message-ID: <20190116145920.GO2900@twin.jikos.cz> (raw)
In-Reply-To: <20181121190545.24798-6-josef@toxicpanda.com>
On Wed, Nov 21, 2018 at 02:05:43PM -0500, Josef Bacik wrote:
> We still need to do all of the accounting cleanup for pending block
> groups if we abort. So set the ret to trans->aborted so if we aborted
> the cleanup happens and everybody is happy.
>
> Reviewed-by: Omar Sandoval <osandov@fb.com>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/extent-tree.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index b9b829c8825c..90423b6749b7 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -10500,11 +10500,17 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
> struct btrfs_root *extent_root = fs_info->extent_root;
> struct btrfs_block_group_item item;
> struct btrfs_key key;
> - int ret = 0;
> + int ret;
>
> if (!trans->can_flush_pending_bgs)
> return;
>
> + /*
> + * If we aborted the transaction with pending bg's we need to just
> + * cleanup the list and carry on.
> + */
> + ret = trans->aborted;
The cleanup is suitable for a separate helper that does only
while (!list_empty(&trans->new_bgs)) {
list_del_init(&block_group->bg_list);
btrfs_delayed_refs_rsv_release(fs_info, 1);
}
and does not rely on the transaction->abort in a function with 'create'
in it's name.
The related part is in a separate patch that ab-uses the fact that
setting ->abort will trigger the cleanup.
https://patchwork.kernel.org/patch/10693081/ will then simply call the
halper instead of
+ /* This cleans up the pending block groups list properly. */
+ if (!trans->aborted)
+ trans->aborted = ret;
+ btrfs_create_pending_block_groups(trans);
Setting aborted to an error code anywhere else than
__btrfs_abort_transaction does not sound right as it misses the whole
report.
next prev parent reply other threads:[~2019-01-16 14:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 19:05 [PATCH 0/7] Abort cleanup fixes Josef Bacik
2018-11-21 19:05 ` [PATCH 1/7] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
2018-11-21 19:05 ` [PATCH 2/7] btrfs: make btrfs_destroy_delayed_refs use btrfs_delete_ref_head Josef Bacik
2018-11-21 19:05 ` [PATCH 3/7] btrfs: handle delayed ref head accounting cleanup in abort Josef Bacik
2018-11-21 19:05 ` [PATCH 4/7] btrfs: call btrfs_create_pending_block_groups unconditionally Josef Bacik
2018-11-21 19:05 ` [PATCH 5/7] btrfs: just delete pending bgs if we are aborted Josef Bacik
2019-01-16 14:59 ` David Sterba [this message]
2019-01-16 15:22 ` David Sterba
2019-01-17 14:56 ` David Sterba
2019-01-17 14:58 ` Josef Bacik
2019-01-17 15:40 ` Nikolay Borisov
2018-11-21 19:05 ` [PATCH 6/7] btrfs: cleanup pending bgs on transaction abort Josef Bacik
2018-11-21 19:05 ` [PATCH 7/7] btrfs: wait on ordered extents on abort cleanup Josef Bacik
2019-01-14 11:55 ` [PATCH 0/7] Abort cleanup fixes David Sterba
2019-01-28 22:06 ` David Sterba
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=20190116145920.GO2900@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;
as well as URLs for NNTP newsgroup(s).