From: Liu Bo <bo.li.liu@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/6] Btrfs: remove BUG() in print_extent_item
Date: Thu, 25 May 2017 18:26:29 -0600 [thread overview]
Message-ID: <20170526002631.8546-5-bo.li.liu@oracle.com> (raw)
In-Reply-To: <20170526002631.8546-1-bo.li.liu@oracle.com>
btrfs_print_leaf() is used in btrfs_get_extent_inline_ref_type, so
here we really want to print the invalid value of ref type instead of
causing a kernel panic.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
fs/btrfs/print-tree.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index fcae61e..4448be6 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -63,6 +63,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
u32 item_size = btrfs_item_size_nr(eb, slot);
u64 flags;
u64 offset;
+ int is_data;
if (item_size < sizeof(*ei)) {
#ifdef BTRFS_COMPAT_EXTENT_TREE_V0
@@ -98,6 +99,8 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
iref = (struct btrfs_extent_inline_ref *)(ei + 1);
}
+ is_data = !!(flags & BTRFS_EXTENT_FLAG_DATA);
+
ptr = (unsigned long)iref;
end = (unsigned long)ei + item_size;
while (ptr < end) {
@@ -121,7 +124,10 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
offset, btrfs_shared_data_ref_count(eb, sref));
break;
default:
- BUG();
+ btrfs_err(eb->fs_info,
+ "extent %llu has invalid ref type %d\n",
+ eb->start, type);
+ return;
}
ptr += btrfs_extent_inline_ref_size(type);
}
--
2.9.4
next prev parent reply other threads:[~2017-05-26 1:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 0:26 [PATCH 0/6] add sanity check for extent inline ref type Liu Bo
2017-05-26 0:26 ` [PATCH 1/6] Btrfs: add a helper to retrive " Liu Bo
2017-05-26 7:09 ` Nikolay Borisov
2017-05-26 17:44 ` Jeff Mahoney
2017-05-26 18:13 ` David Sterba
2017-05-26 18:15 ` David Sterba
2017-05-26 0:26 ` [PATCH 2/6] Btrfs: convert to use btrfs_get_extent_inline_ref_type Liu Bo
2017-05-26 0:26 ` [PATCH 3/6] Btrfs: remove BUG() in btrfs_extent_inline_ref_size Liu Bo
2017-05-26 0:26 ` Liu Bo [this message]
2017-05-26 18:18 ` [PATCH 4/6] Btrfs: remove BUG() in print_extent_item David Sterba
2017-05-26 19:52 ` Liu Bo
2017-05-26 0:26 ` [PATCH 5/6] Btrfs: remove BUG() in add_data_reference Liu Bo
2017-05-26 18:20 ` David Sterba
2017-05-26 20:01 ` Liu Bo
2017-05-26 0:26 ` [PATCH 6/6] Btrfs: add sanity check of extent item in scrub Liu Bo
2017-05-26 18:33 ` David Sterba
2017-05-26 20:20 ` Liu Bo
2017-05-29 1:48 ` Qu Wenruo
2017-05-29 13:49 ` David Sterba
2017-05-30 14:05 ` [PATCH 0/6] add sanity check for extent inline ref type Ivan Sizov
2017-05-30 18:02 ` Liu Bo
2017-05-30 18:57 ` Ivan Sizov
2017-06-01 17:35 ` Liu Bo
2017-06-01 20:26 ` Ivan Sizov
2017-06-01 22:57 ` Liu Bo
2017-06-19 9:06 ` Ivan Sizov
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=20170526002631.8546-5-bo.li.liu@oracle.com \
--to=bo.li.liu@oracle.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).