From: Josef Bacik <josef@toxicpanda.com>
To: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: [PATCH 3/7] btrfs: splice rc->reloc_roots onto reloc roots in recover
Date: Mon, 2 Mar 2020 13:47:53 -0500 [thread overview]
Message-ID: <20200302184757.44176-4-josef@toxicpanda.com> (raw)
In-Reply-To: <20200302184757.44176-1-josef@toxicpanda.com>
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. Handle this
by splicing rc->reloc_roots onto our local reloc_roots list so they are
properly cleaned up.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 173fc7628235..f42589cb351c 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4710,6 +4710,9 @@ int btrfs_recover_relocation(struct btrfs_root *root)
if (ret < 0 && !err)
err = ret;
out_free:
+ mutex_lock(&fs_info->reloc_mutex);
+ list_splice_init(&rc->reloc_roots, &reloc_roots);
+ mutex_unlock(&fs_info->reloc_mutex);
kfree(rc);
out:
if (!list_empty(&reloc_roots))
--
2.24.1
next prev parent reply other threads:[~2020-03-02 18:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 18:47 [PATCH 0/7] relocation error handling fixes Josef Bacik
2020-03-02 18:47 ` [PATCH 1/7] btrfs: drop block from cache on error in relocation Josef Bacik
2020-03-03 0:59 ` Qu Wenruo
2020-03-03 14:59 ` David Sterba
2020-03-03 20:27 ` Josef Bacik
2020-03-02 18:47 ` [PATCH 2/7] btrfs: unset reloc control if we fail to recover Josef Bacik
2020-03-03 0:58 ` Qu Wenruo
2020-03-03 1:03 ` Josef Bacik
2020-03-03 1:18 ` Qu Wenruo
2020-03-03 15:21 ` David Sterba
2020-03-02 18:47 ` Josef Bacik [this message]
2020-03-03 1:02 ` [PATCH 3/7] btrfs: splice rc->reloc_roots onto reloc roots in recover Qu Wenruo
2020-03-02 18:47 ` [PATCH 4/7] btrfs: run clean_dirty_subvols if we fail to start a trans Josef Bacik
2020-03-03 1:04 ` Qu Wenruo
2020-03-03 15:32 ` David Sterba
2020-03-02 18:47 ` [PATCH 5/7] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root Josef Bacik
2020-03-02 19:31 ` David Sterba
2020-03-02 19:51 ` Josef Bacik
2020-03-03 15:34 ` David Sterba
2020-03-03 0:31 ` Qu Wenruo
2020-03-02 18:47 ` [PATCH 6/7] btrfs: hold a ref on the root->reloc_root Josef Bacik
2020-03-03 1:12 ` Qu Wenruo
2020-03-03 1:14 ` Josef Bacik
2020-03-03 15:51 ` David Sterba
2020-03-02 18:47 ` [PATCH 7/7] btrfs: remove a BUG_ON() from merge_reloc_roots() Josef Bacik
2020-03-03 1:17 ` Qu Wenruo
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=20200302184757.44176-4-josef@toxicpanda.com \
--to=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