All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 24/42] btrfs: change insert_dirty_subvol to return errors
Date: Thu, 12 Nov 2020 16:18:51 -0500	[thread overview]
Message-ID: <353dbca3af54e9f485f1aa9c9ae3501ff19b2952.1605215646.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1605215645.git.josef@toxicpanda.com>

This will be able to return errors in the future, so change it to return
an error and handle the error appropriately.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/relocation.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index d61dc2b1928c..5174f5b2765e 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1575,9 +1575,9 @@ static int find_next_key(struct btrfs_path *path, int level,
 /*
  * Insert current subvolume into reloc_control::dirty_subvol_roots
  */
-static void insert_dirty_subvol(struct btrfs_trans_handle *trans,
-				struct reloc_control *rc,
-				struct btrfs_root *root)
+static int insert_dirty_subvol(struct btrfs_trans_handle *trans,
+			       struct reloc_control *rc,
+			       struct btrfs_root *root)
 {
 	struct btrfs_root *reloc_root = root->reloc_root;
 	struct btrfs_root_item *reloc_root_item;
@@ -1597,6 +1597,7 @@ static void insert_dirty_subvol(struct btrfs_trans_handle *trans,
 		btrfs_grab_root(root);
 		list_add_tail(&root->reloc_dirty_list, &rc->dirty_subvol_roots);
 	}
+	return 0;
 }
 
 static int clean_dirty_subvols(struct reloc_control *rc)
@@ -1808,8 +1809,13 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
 out:
 	btrfs_free_path(path);
 
-	if (err == 0)
-		insert_dirty_subvol(trans, rc, root);
+	if (err == 0) {
+		ret = insert_dirty_subvol(trans, rc, root);
+		if (ret) {
+			btrfs_abort_transaction(trans, ret);
+			err = ret;
+		}
+	}
 
 	if (trans)
 		btrfs_end_transaction_throttle(trans);
-- 
2.26.2


  parent reply	other threads:[~2020-11-12 21:20 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-12 21:18 [PATCH 00/42] Cleanup error handling in relocation Josef Bacik
2020-11-12 21:18 ` [PATCH 01/42] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-11-13  0:02   ` Qu Wenruo
2020-11-13 11:05     ` Josef Bacik
2020-11-12 21:18 ` [PATCH 02/42] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-11-12 21:18 ` [PATCH 03/42] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-11-12 21:18 ` [PATCH 04/42] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-11-12 21:18 ` [PATCH 05/42] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-11-12 21:18 ` [PATCH 06/42] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-11-12 21:18 ` [PATCH 07/42] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-11-12 21:18 ` [PATCH 08/42] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-11-12 21:18 ` [PATCH 09/42] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-11-12 21:18 ` [PATCH 10/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-11-12 21:18 ` [PATCH 11/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-11-12 21:18 ` [PATCH 12/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-11-12 21:18 ` [PATCH 13/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-11-12 21:18 ` [PATCH 14/42] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-11-12 21:18 ` [PATCH 15/42] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-11-12 21:18 ` [PATCH 16/42] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-11-12 21:18 ` [PATCH 17/42] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-11-12 21:18 ` [PATCH 18/42] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-11-12 21:18 ` [PATCH 19/42] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-11-12 21:18 ` [PATCH 20/42] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-11-12 21:18 ` [PATCH 21/42] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-11-12 21:18 ` [PATCH 22/42] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-11-12 21:18 ` [PATCH 23/42] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-11-12 21:18 ` Josef Bacik [this message]
2020-11-12 21:18 ` [PATCH 25/42] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-11-12 21:18 ` [PATCH 26/42] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-11-12 21:18 ` [PATCH 27/42] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-11-12 21:18 ` [PATCH 28/42] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-11-12 21:18 ` [PATCH 29/42] btrfs: handle initial btrfs_cow_block error in replace_path Josef Bacik
2020-11-12 21:18 ` [PATCH 30/42] btrfs: handle the loop " Josef Bacik
2020-11-12 21:18 ` [PATCH 31/42] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-11-12 21:18 ` [PATCH 32/42] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-11-12 21:19 ` [PATCH 33/42] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-11-12 21:19 ` [PATCH 34/42] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-11-12 21:19 ` [PATCH 35/42] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-11-12 21:19 ` [PATCH 36/42] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-11-12 21:19 ` [PATCH 37/42] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation Josef Bacik
2020-11-12 21:19 ` [PATCH 38/42] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot Josef Bacik
2020-11-12 21:19 ` [PATCH 39/42] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-11-12 21:19 ` [PATCH 40/42] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-11-12 21:19 ` [PATCH 41/42] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-11-12 21:19 ` [PATCH 42/42] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-11-13  3:53 ` [PATCH 00/42] Cleanup error handling " Zygo Blaxell
2020-11-13 11:03   ` Josef Bacik
2020-11-13 14:39     ` Zygo Blaxell
2020-11-15  0:37       ` Zygo Blaxell

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=353dbca3af54e9f485f1aa9c9ae3501ff19b2952.1605215646.git.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 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.