From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Cc: Qu Wenruo <wqu@suse.com>
Subject: [PATCH v5 15/52] btrfs: check record_root_in_trans related failures in select_reloc_root
Date: Mon, 7 Dec 2020 08:57:07 -0500 [thread overview]
Message-ID: <ca88279682628ac78511f5b94d7a5a093e5024b2.1607349282.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1607349281.git.josef@toxicpanda.com>
We will record the fs root or the reloc root in the trans in
select_reloc_root. These will actually return errors in the following
patches, so check their return value here and return it up the stack.
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 05b80b9ab1e1..a3ad44605695 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1990,6 +1990,7 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
struct btrfs_backref_node *next;
struct btrfs_root *root;
int index = 0;
+ int ret;
next = node;
while (1) {
@@ -2025,11 +2026,15 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
}
if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
- record_reloc_root_in_trans(trans, root);
+ ret = record_reloc_root_in_trans(trans, root);
+ if (ret)
+ return ERR_PTR(ret);
break;
}
- btrfs_record_root_in_trans(trans, root);
+ ret = btrfs_record_root_in_trans(trans, root);
+ if (ret)
+ return ERR_PTR(ret);
root = root->reloc_root;
if (next->new_bytenr != root->node->start) {
--
2.26.2
next prev parent reply other threads:[~2020-12-07 13:59 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 13:56 [PATCH v5 00/52] Cleanup error handling in relocation Josef Bacik
2020-12-07 13:56 ` [PATCH v5 01/52] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-12-07 13:56 ` [PATCH v5 02/52] btrfs: modify the new_root highest_objectid under a ref count Josef Bacik
2020-12-08 13:51 ` Nikolay Borisov
2020-12-07 13:56 ` [PATCH v5 03/52] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-12-07 13:56 ` [PATCH v5 04/52] btrfs: keep track of the root owner for relocation reads Josef Bacik
2020-12-07 13:56 ` [PATCH v5 05/52] btrfs: noinline btrfs_should_cancel_balance Josef Bacik
2020-12-07 13:56 ` [PATCH v5 06/52] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Josef Bacik
2020-12-07 13:56 ` [PATCH v5 07/52] btrfs: pass down the tree block level through ref-verify Josef Bacik
2020-12-07 13:57 ` [PATCH v5 08/52] btrfs: make sure owner is set in ref-verify Josef Bacik
2020-12-07 13:57 ` [PATCH v5 09/52] btrfs: don't clear ret in btrfs_start_dirty_block_groups Josef Bacik
2020-12-07 13:57 ` [PATCH v5 10/52] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-12-07 13:57 ` [PATCH v5 11/52] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-07 13:57 ` [PATCH v5 12/52] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-12-07 13:57 ` [PATCH v5 13/52] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-12-08 14:44 ` Zygo Blaxell
2020-12-07 13:57 ` [PATCH v5 14/52] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-07 13:57 ` Josef Bacik [this message]
2020-12-07 13:57 ` [PATCH v5 16/52] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-12-07 13:57 ` [PATCH v5 17/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-07 13:57 ` [PATCH v5 18/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-07 13:57 ` [PATCH v5 19/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-07 13:57 ` [PATCH v5 20/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-07 13:57 ` [PATCH v5 21/52] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-07 13:57 ` [PATCH v5 22/52] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-07 13:57 ` [PATCH v5 23/52] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-07 13:57 ` [PATCH v5 24/52] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-07 13:57 ` [PATCH v5 25/52] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-07 13:57 ` [PATCH v5 26/52] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-07 13:57 ` [PATCH v5 27/52] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-08 13:53 ` Nikolay Borisov
2020-12-07 13:57 ` [PATCH v5 28/52] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-07 13:57 ` [PATCH v5 29/52] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-07 13:57 ` [PATCH v5 30/52] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-07 13:57 ` [PATCH v5 31/52] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-07 13:57 ` [PATCH v5 32/52] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-07 13:57 ` [PATCH v5 33/52] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-07 13:57 ` [PATCH v5 34/52] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-07 13:57 ` [PATCH v5 35/52] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-07 13:57 ` [PATCH v5 36/52] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-07 13:57 ` [PATCH v5 37/52] btrfs: handle btrfs_cow_block errors in replace_path Josef Bacik
2020-12-07 13:57 ` [PATCH v5 38/52] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-07 13:57 ` [PATCH v5 39/52] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-07 13:57 ` [PATCH v5 40/52] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-07 13:57 ` [PATCH v5 41/52] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-07 13:57 ` [PATCH v5 42/52] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-07 13:57 ` [PATCH v5 43/52] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-07 13:57 ` [PATCH v5 44/52] btrfs: handle __add_reloc_root failures in btrfs_recover_relocation Josef Bacik
2020-12-07 13:57 ` [PATCH v5 45/52] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-07 13:57 ` [PATCH v5 46/52] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-07 13:57 ` [PATCH v5 47/52] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-12-07 13:57 ` [PATCH v5 48/52] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-07 13:57 ` [PATCH v5 49/52] btrfs: do not WARN_ON() if we can't find the reloc root Josef Bacik
2020-12-07 13:57 ` [PATCH v5 50/52] btrfs: print the actual offset in btrfs_root_name Josef Bacik
2020-12-07 13:57 ` [PATCH v5 51/52] btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik
2020-12-07 13:57 ` [PATCH v5 52/52] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list 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=ca88279682628ac78511f5b94d7a5a093e5024b2.1607349282.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.