From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans
Date: Wed, 4 Mar 2020 11:18:27 -0500 [thread overview]
Message-ID: <20200304161830.2360-6-josef@toxicpanda.com> (raw)
In-Reply-To: <20200304161830.2360-1-josef@toxicpanda.com>
If we do merge_reloc_roots() we could insert a few roots onto the dirty
subvol roots list, where we hold a ref on them. If we fail to start the
transaction we need to run clean_dirty_subvols() in order to cleanup the
refs.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index f6237d885fe0..53509c367eff 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4279,10 +4279,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
goto out_free;
}
btrfs_commit_transaction(trans);
+out_free:
ret = clean_dirty_subvols(rc);
if (ret < 0 && !err)
err = ret;
-out_free:
btrfs_free_block_rsv(fs_info, rc->block_rsv);
btrfs_free_path(path);
return err;
@@ -4711,6 +4711,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
trans = btrfs_join_transaction(rc->extent_root);
if (IS_ERR(trans)) {
+ clean_dirty_subvols(rc);
err = PTR_ERR(trans);
goto out_free;
}
--
2.24.1
next prev parent reply other threads:[~2020-03-04 16:18 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
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 ` Josef Bacik [this message]
2020-03-05 11:40 ` [PATCH 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans 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 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans 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=20200304161830.2360-6-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;
as well as URLs for NNTP newsgroup(s).