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 3/8] btrfs: unset reloc control if we fail to recover
Date: Thu, 5 Mar 2020 19:38:17 +0800 [thread overview]
Message-ID: <78d28297-1c39-9150-b846-2b435b0b48d1@gmx.com> (raw)
In-Reply-To: <20200304161830.2360-4-josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 1940 bytes --]
On 2020/3/5 上午12:18, Josef Bacik wrote:
> If we fail to load an fs root, or fail to start a transaction we can
> bail without unsetting the reloc control, which leads to problems later
> when we free the reloc control but still have it attached to the file
> system.
>
> In the normal path we'll end up calling unset_reloc_control() twice, but
> all it does is set fs_info->reloc_control = NULL, and we can only have
> one balance at a time so it's not racey.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
> ---
> fs/btrfs/relocation.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 2141519a9dd0..c496f8ed8c7e 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -4657,9 +4657,8 @@ int btrfs_recover_relocation(struct btrfs_root *root)
>
> trans = btrfs_join_transaction(rc->extent_root);
> if (IS_ERR(trans)) {
> - unset_reloc_control(rc);
> err = PTR_ERR(trans);
> - goto out_free;
> + goto out_unset;
> }
>
> rc->merge_reloc_tree = 1;
> @@ -4679,7 +4678,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
> if (IS_ERR(fs_root)) {
> err = PTR_ERR(fs_root);
> list_add_tail(&reloc_root->root_list, &reloc_roots);
> - goto out_free;
> + goto out_unset;
> }
>
> err = __add_reloc_root(reloc_root);
> @@ -4690,7 +4689,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
>
> err = btrfs_commit_transaction(trans);
> if (err)
> - goto out_free;
> + goto out_unset;
>
> merge_reloc_roots(rc);
>
> @@ -4706,6 +4705,8 @@ int btrfs_recover_relocation(struct btrfs_root *root)
> ret = clean_dirty_subvols(rc);
> if (ret < 0 && !err)
> err = ret;
> +out_unset:
> + unset_reloc_control(rc);
> out_free:
> kfree(rc);
> out:
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-03-05 11:38 UTC|newest]
Thread overview: 24+ 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 [this message]
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
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 3/8] btrfs: unset reloc control if we fail to recover 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=78d28297-1c39-9150-b846-2b435b0b48d1@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).