summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2016-09-15 03:23:39 +0300
committerDavid Sterba <dsterba@suse.com>2016-09-26 19:04:01 +0300
commita42cbec9c662ced87f1d0f22a1c114de4cf6e352 (patch)
treedff3e55af355e9ce4e28e7a28ec3ad5f1e6dd2e5 /fs/btrfs
parenta43f7f82064220082eba7075c5a844d773fdef1b (diff)
downloadlinux-a42cbec9c662ced87f1d0f22a1c114de4cf6e352.tar.xz
Btrfs: add error handling for extent buffer in print tree
Somehow we missed btrfs_print_tree when last time we updated error handling for read_extent_block(). This keeps us from getting a NULL pointer panic when btrfs_print_tree's read_extent_block() fails. Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/print-tree.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 147dc6ca5de1..aaeee45d917d 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -356,6 +356,13 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
struct extent_buffer *next = read_tree_block(root,
btrfs_node_blockptr(c, i),
btrfs_node_ptr_generation(c, i));
+ if (IS_ERR(next)) {
+ continue;
+ } else if (!extent_buffer_uptodate(next)) {
+ free_extent_buffer(next);
+ continue;
+ }
+
if (btrfs_is_leaf(next) &&
level != 1)
BUG();