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....@oracle.com>
---
 fs/btrfs/print-tree.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 147dc6c..aaeee45 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();
-- 
2.5.5

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to