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 v3 50/54] btrfs: check return value of btrfs_commit_transaction in relocation
Date: Thu, 3 Dec 2020 13:42:55 +0800 [thread overview]
Message-ID: <3ea9ba22-d9c5-2fca-7d3b-f7b227093c97@gmx.com> (raw)
In-Reply-To: <dd0d601ca7d0b24c316159e2c631f623863daafd.1606938211.git.josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 1625 bytes --]
On 2020/12/3 上午3:51, Josef Bacik wrote:
> There's a few places where we don't check the return value of
> btrfs_commit_transaction in relocation.c. Thankfully all these places
> have straightforward error handling, so simply change all of the sites
> at once.
>
> 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 099a64b47020..15b6e54394b7 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -1905,7 +1905,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
> list_splice(&reloc_roots, &rc->reloc_roots);
>
> if (!err)
> - btrfs_commit_transaction(trans);
> + err = btrfs_commit_transaction(trans);
> else
> btrfs_end_transaction(trans);
> return err;
> @@ -3436,8 +3436,7 @@ int prepare_to_relocate(struct reloc_control *rc)
> */
> return PTR_ERR(trans);
> }
> - btrfs_commit_transaction(trans);
> - return 0;
> + return btrfs_commit_transaction(trans);
> }
>
> static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
> @@ -3596,7 +3595,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
> err = PTR_ERR(trans);
> goto out_free;
> }
> - btrfs_commit_transaction(trans);
> + ret = btrfs_commit_transaction(trans);
> + if (ret && !err)
> + err = ret;
> out_free:
> ret = clean_dirty_subvols(rc);
> if (ret < 0 && !err)
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-03 5:44 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 19:50 [PATCH v3 00/54] Cleanup error handling in relocation Josef Bacik
2020-12-02 19:50 ` [PATCH v3 01/54] btrfs: fix error handling in commit_fs_roots Josef Bacik
2020-12-03 1:45 ` Qu Wenruo
2020-12-03 8:09 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 02/54] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-12-03 1:48 ` Qu Wenruo
2020-12-03 8:21 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 03/54] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-12-03 1:49 ` Qu Wenruo
2020-12-03 8:44 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 04/54] btrfs: keep track of the root owner for relocation reads Josef Bacik
2020-12-03 2:04 ` Qu Wenruo
2020-12-03 15:55 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 05/54] btrfs: noinline btrfs_should_cancel_balance Josef Bacik
2020-12-03 2:06 ` Qu Wenruo
2020-12-03 8:44 ` Johannes Thumshirn
2020-12-03 9:00 ` Nikolay Borisov
2020-12-03 17:04 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 06/54] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Josef Bacik
2020-12-03 2:08 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 07/54] btrfs: pass down the tree block level through ref-verify Josef Bacik
2020-12-02 19:50 ` [PATCH v3 08/54] btrfs: make sure owner is set in ref-verify Josef Bacik
2020-12-02 19:50 ` [PATCH v3 09/54] btrfs: don't clear ret in btrfs_start_dirty_block_groups Josef Bacik
2020-12-03 2:13 ` Qu Wenruo
2020-12-03 8:58 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 10/54] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-12-03 2:14 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 11/54] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-03 2:15 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 12/54] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-12-03 2:20 ` Qu Wenruo
2020-12-03 13:50 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 13/54] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-12-03 2:23 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 14/54] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-03 2:29 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 15/54] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-12-03 2:33 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 16/54] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-12-03 2:39 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 17/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-03 2:40 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 18/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-02 19:50 ` [PATCH v3 19/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-03 2:41 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 20/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-03 2:42 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 21/54] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-03 2:43 ` Qu Wenruo
2020-12-03 16:06 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 22/54] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-03 2:44 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 23/54] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-03 2:47 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 24/54] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-03 2:48 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 25/54] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-02 19:50 ` [PATCH v3 26/54] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-03 2:56 ` Qu Wenruo
2020-12-03 16:14 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 27/54] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-03 3:00 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 28/54] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-02 19:50 ` [PATCH v3 29/54] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-03 3:29 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 30/54] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-03 4:49 ` Qu Wenruo
2020-12-03 16:18 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 31/54] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-03 4:51 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 32/54] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-02 19:50 ` [PATCH v3 33/54] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-02 19:50 ` [PATCH v3 34/54] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-02 19:50 ` [PATCH v3 35/54] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-03 4:54 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 36/54] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-03 4:55 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 37/54] btrfs: handle initial btrfs_cow_block error in replace_path Josef Bacik
2020-12-03 5:05 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 38/54] btrfs: handle the loop " Josef Bacik
2020-12-03 5:11 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 39/54] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-03 5:13 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 40/54] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-03 5:14 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 41/54] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-03 5:15 ` Qu Wenruo
2020-12-03 16:26 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 42/54] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-03 5:19 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 43/54] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-03 5:20 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 44/54] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-03 5:25 ` Qu Wenruo
2020-12-03 16:34 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 45/54] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation Josef Bacik
2020-12-03 5:32 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 46/54] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot Josef Bacik
2020-12-03 5:34 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 47/54] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-03 5:39 ` Qu Wenruo
2020-12-03 16:53 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 48/54] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-03 5:40 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 49/54] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-12-03 5:42 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 50/54] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-03 5:42 ` Qu Wenruo [this message]
2020-12-02 19:51 ` [PATCH v3 51/54] btrfs: do not WARN_ON() if we can't find the reloc root Josef Bacik
2020-12-02 19:51 ` [PATCH v3 52/54] btrfs: print the actual offset in btrfs_root_name Josef Bacik
2020-12-03 5:44 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 53/54] btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik
2020-12-02 19:51 ` [PATCH v3 54/54] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list Josef Bacik
2020-12-03 5:47 ` 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=3ea9ba22-d9c5-2fca-7d3b-f7b227093c97@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