From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 35/42] btrfs: remove the extent item sanity checks in relocate_block_group
Date: Thu, 12 Nov 2020 16:19:02 -0500 [thread overview]
Message-ID: <736cea4bf84d6f8b919e13d02836f46c9b2fa5fd.1605215646.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1605215645.git.josef@toxicpanda.com>
These checks are all taken care of for us by the tree checker code.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 100cd8eba91c..80d5fea41791 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3365,20 +3365,6 @@ static void unset_reloc_control(struct reloc_control *rc)
mutex_unlock(&fs_info->reloc_mutex);
}
-static int check_extent_flags(u64 flags)
-{
- if ((flags & BTRFS_EXTENT_FLAG_DATA) &&
- (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK))
- return 1;
- if (!(flags & BTRFS_EXTENT_FLAG_DATA) &&
- !(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK))
- return 1;
- if ((flags & BTRFS_EXTENT_FLAG_DATA) &&
- (flags & BTRFS_BLOCK_FLAG_FULL_BACKREF))
- return 1;
- return 0;
-}
-
static noinline_for_stack
int prepare_to_relocate(struct reloc_control *rc)
{
@@ -3430,7 +3416,6 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
struct btrfs_path *path;
struct btrfs_extent_item *ei;
u64 flags;
- u32 item_size;
int ret;
int err = 0;
int progress = 0;
@@ -3479,19 +3464,6 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
struct btrfs_extent_item);
- item_size = btrfs_item_size_nr(path->nodes[0], path->slots[0]);
- if (item_size >= sizeof(*ei)) {
- flags = btrfs_extent_flags(path->nodes[0], ei);
- ret = check_extent_flags(flags);
- BUG_ON(ret);
- } else if (unlikely(item_size == sizeof(struct btrfs_extent_item_v0))) {
- err = -EINVAL;
- btrfs_print_v0_err(trans->fs_info);
- btrfs_abort_transaction(trans, err);
- break;
- } else {
- BUG();
- }
if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) {
ret = add_tree_block(rc, &key, path, &blocks);
--
2.26.2
next prev 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 ` [PATCH 24/42] btrfs: change insert_dirty_subvol to return errors Josef Bacik
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 ` Josef Bacik [this message]
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=736cea4bf84d6f8b919e13d02836f46c9b2fa5fd.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 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).