From: Nikolay Borisov <nborisov@suse.com>
To: Josef Bacik <josef@toxicpanda.com>,
linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH v2 33/42] btrfs: handle extent reference errors in do_relocation
Date: Tue, 24 Nov 2020 15:15:26 +0200 [thread overview]
Message-ID: <39ce1550-9bb3-3ddb-cc27-00d9f193cc7b@suse.com> (raw)
In-Reply-To: <9c5ebe55c78553d1a07559f63d26a446d5642bc3.1605284383.git.josef@toxicpanda.com>
On 13.11.20 г. 18:23 ч., Josef Bacik wrote:
> We can already deal with errors appropriately from do_relocation, simply
> handle any errors that come from changing the refs at this point
> cleanly. We have to abort the transaction if we fail here as we've
> modified metadata at this point.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/relocation.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 74d52fc457c7..bc63c4bb4057 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -2447,10 +2447,12 @@ static int do_relocation(struct btrfs_trans_handle *trans,
> btrfs_init_tree_ref(&ref, node->level,
> btrfs_header_owner(upper->eb));
> ret = btrfs_inc_extent_ref(trans, &ref);
> - BUG_ON(ret);
> -
> - ret = btrfs_drop_subtree(trans, root, eb, upper->eb);
> - BUG_ON(ret);
> + if (!ret)
> + btrfs_drop_subtree(trans, root, eb, upper->eb);
> + if (ret) {
> + btrfs_abort_transaction(trans, ret);
> + err = ret;
> + }
nit: I'd prefer this:
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index bc63c4bb4057..ce063c83d337 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2447,12 +2447,12 @@ static int do_relocation(struct btrfs_trans_handle *trans,
btrfs_init_tree_ref(&ref, node->level,
btrfs_header_owner(upper->eb));
ret = btrfs_inc_extent_ref(trans, &ref);
- if (!ret)
- btrfs_drop_subtree(trans, root, eb, upper->eb);
if (ret) {
btrfs_abort_transaction(trans, ret);
err = ret;
+ goto next;
}
+ btrfs_drop_subtree(trans, root, eb, upper->eb);
One less conditional statement to worry about
> }
> next:
> if (!upper->pending)
>
next prev parent reply other threads:[~2020-11-24 13:15 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 16:22 [PATCH v2 00/42] Cleanup error handling in relocation Josef Bacik
2020-11-13 16:22 ` [PATCH v2 01/42] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-11-13 16:22 ` [PATCH v2 02/42] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-11-24 10:44 ` Nikolay Borisov
2020-11-24 16:56 ` Filipe Manana
2020-11-24 18:44 ` Josef Bacik
2020-11-13 16:22 ` [PATCH v2 03/42] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-11-13 16:22 ` [PATCH v2 04/42] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-11-13 16:22 ` [PATCH v2 05/42] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-11-24 11:02 ` Nikolay Borisov
2020-11-24 12:53 ` Nikolay Borisov
2020-11-13 16:22 ` [PATCH v2 06/42] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-11-13 16:22 ` [PATCH v2 07/42] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-11-13 16:22 ` [PATCH v2 08/42] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-11-13 16:22 ` [PATCH v2 09/42] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-11-13 16:23 ` [PATCH v2 10/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-11-13 16:23 ` [PATCH v2 11/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-11-13 16:23 ` [PATCH v2 12/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-11-13 16:23 ` [PATCH v2 13/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-11-24 12:37 ` Nikolay Borisov
2020-12-02 18:05 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 14/42] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-11-24 12:42 ` Nikolay Borisov
2020-12-02 18:12 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 15/42] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-11-13 16:23 ` [PATCH v2 16/42] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-11-13 16:23 ` [PATCH v2 17/42] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 18/42] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-11-13 16:23 ` [PATCH v2 19/42] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 20/42] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-11-24 12:51 ` Nikolay Borisov
2020-11-13 16:23 ` [PATCH v2 21/42] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 22/42] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 23/42] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-11-13 16:23 ` [PATCH v2 24/42] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-11-13 16:23 ` [PATCH v2 25/42] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-11-13 16:23 ` [PATCH v2 26/42] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-11-13 16:23 ` [PATCH v2 27/42] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 28/42] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-11-13 16:23 ` [PATCH v2 29/42] btrfs: handle initial btrfs_cow_block error in replace_path Josef Bacik
2020-11-13 16:23 ` [PATCH v2 30/42] btrfs: handle the loop " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 31/42] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 32/42] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 33/42] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-11-24 13:15 ` Nikolay Borisov [this message]
2020-11-13 16:23 ` [PATCH v2 34/42] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-11-13 16:23 ` [PATCH v2 35/42] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-11-13 16:23 ` [PATCH v2 36/42] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-11-13 16:23 ` [PATCH v2 37/42] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation Josef Bacik
2020-11-24 13:26 ` Nikolay Borisov
2020-12-02 18:29 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 38/42] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 39/42] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-11-13 16:23 ` [PATCH v2 40/42] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-11-13 16:23 ` [PATCH v2 41/42] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-11-13 16:23 ` [PATCH v2 42/42] btrfs: check return value of btrfs_commit_transaction in relocation 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=39ce1550-9bb3-3ddb-cc27-00d9f193cc7b@suse.com \
--to=nborisov@suse.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).