From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Josef Bacik <josef@toxicpanda.com>,
linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH 4/8] btrfs: free the reloc_control in a consistent way
Date: Thu, 5 Mar 2020 19:39:33 +0800 [thread overview]
Message-ID: <f77683bc-c644-25a8-6d97-fbe339bd5f98@gmx.com> (raw)
In-Reply-To: <20200304161830.2360-5-josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 1960 bytes --]
On 2020/3/5 上午12:18, Josef Bacik wrote:
> If we have an error while processing the reloc roots we could leak roots
> that were added to rc->reloc_roots before we hit the error. We could
> have also not removed the reloct tree mapping from our rb_tree, so clean
> up any remaining nodes in the reloc root rb_tree.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/relocation.c | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index c496f8ed8c7e..f6237d885fe0 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -4387,6 +4387,20 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)
> return rc;
> }
>
> +static void free_reloc_control(struct reloc_control *rc)
> +{
> + struct rb_node *rb_node;
> + struct mapping_node *node;
> +
> + free_reloc_roots(&rc->reloc_roots);
> + while ((rb_node = rb_first(&rc->reloc_root_tree.rb_root))) {
rbtree_postorder_for_each_entry_safe().
So that we don't need to bother the re-balance of rbtree.
Thanks,
Qu
> + node = rb_entry(rb_node, struct mapping_node, rb_node);
> + rb_erase(rb_node, &rc->reloc_root_tree.rb_root);
> + kfree(node);
> + }
> + kfree(rc);
> +}
> +
> /*
> * Print the block group being relocated
> */
> @@ -4531,7 +4545,7 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)
> btrfs_dec_block_group_ro(rc->block_group);
> iput(rc->data_inode);
> btrfs_put_block_group(rc->block_group);
> - kfree(rc);
> + free_reloc_control(rc);
> return err;
> }
>
> @@ -4708,7 +4722,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
> out_unset:
> unset_reloc_control(rc);
> out_free:
> - kfree(rc);
> + free_reloc_control(rc);
> out:
> if (!list_empty(&reloc_roots))
> free_reloc_roots(&reloc_roots);
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-03-05 11:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 16:18 [PATCH 0/8][v2] relocation error handling fixes Josef Bacik
2020-03-04 16:18 ` [PATCH 1/8] btrfs: drop block from cache on error in relocation Josef Bacik
2020-03-05 11:37 ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 2/8] btrfs: do not init a reloc root if we aren't relocating Josef Bacik
2020-03-04 18:44 ` Nikolay Borisov
2020-03-04 18:47 ` Josef Bacik
2020-03-05 11:24 ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 3/8] btrfs: unset reloc control if we fail to recover Josef Bacik
2020-03-05 11:38 ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 4/8] btrfs: free the reloc_control in a consistent way Josef Bacik
2020-03-05 11:39 ` Qu Wenruo [this message]
2020-03-13 15:18 ` David Sterba
2020-03-13 15:32 ` Josef Bacik
2020-03-14 0:13 ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans Josef Bacik
2020-03-05 11:40 ` Qu Wenruo
2020-03-05 17:46 ` David Sterba
2020-03-04 16:18 ` [PATCH 6/8] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root Josef Bacik
2020-03-05 11:41 ` Qu Wenruo
2020-03-05 13:54 ` Josef Bacik
2020-03-04 16:18 ` [PATCH 7/8] btrfs: hold a ref on the root->reloc_root Josef Bacik
2020-03-04 16:18 ` [PATCH 8/8] btrfs: remove a BUG_ON() from merge_reloc_roots() Josef Bacik
2020-03-13 14:35 ` [PATCH 0/8][v2] relocation error handling fixes David Sterba
2020-03-13 15:44 [PATCH 0/8][v3] " Josef Bacik
2020-03-13 15:44 ` [PATCH 4/8] btrfs: free the reloc_control in a consistent way Josef Bacik
2020-03-13 17:18 ` David Sterba
2020-03-13 17:38 ` David Sterba
2020-03-13 17:39 ` Josef Bacik
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=f77683bc-c644-25a8-6d97-fbe339bd5f98@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--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).