btrfs-progs: pass up return value of walk_down_tree
PATCH 1/1 btrfs-progs: pass up return value of walk_down_tree
Pass up return value of walk_down_tree, so the caller can handle it. This also fixes a segfault when read_tree_block fails with NULL returned.
Signed-off-by Lin Ming <[email protected]>
--- cmds-check.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
cmds-check.c +12 -4
@@ -1201,7 +1201,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,struct extent_buffer *next;struct extent_buffer *cur;u32 blocksize; -int ret; +int ret, err =0 ;u64 refs;WARN_ON (*level <0 );
@@ -1209,14 +1209,18 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, ret =btrfs_lookup_extent_info (NULL , root, path->nodes[*level]->start, path->nodes[*level]->len, &refs,NULL ); -if (ret <0 ) +if (ret <0 ) { + err = ret; goto out; + }if (refs >1 ) { ret =enter_shared_node (root, path->nodes[*level]->start, refs, wc, *level); -if (ret >0 ) +if (ret >0 ) { + err = ret; goto out; + } }while (*level >=0 ) {
@@ -1256,6 +1260,10 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,reada_walk_down (root, cur, path->slots[*level]); next =read_tree_block (root, bytenr, blocksize, ptr_gen); +if (!next) { + err = -EIO ; + goto out; + } } *level = *level -1 ;
@@ -1265,7 +1273,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, } out: path->slots[*level] =btrfs_header_nritems (path->nodes[*level]); -return 0 ; +return err; } static int walk_up_tree(struct btrfs_root *root, struct btrfs_path *path,
Signature · 1 line
1.7.2.5