RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Preserve process_one_leaf return value. 

The return value in process_one_leaf could be over-written while
looping over the items in the leaf.

This patch will preserve a non-zero return value to the calling
function if a non-zero return value is encountered in the loop.

The return value of one (1) is consistent with non-zero values
that could be returned while processing the leaf.

The only caller of this function (walk_down_tree) would ignore
the return value anyway.  But this patch will correct the
behaviour in case future changes intend to utilize the return
value.

Signed-off-by: Mitch Harder <mitch.harder@sabayonlinux.org>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Mitch Harder 2014-02-07 12:53:50 -06:00 committed by Chris Mason
parent 771040bb35
commit 5218123d8f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmds-check.c
View File

@ -1219,6 +1219,7 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
u32 nritems; u32 nritems;
int i; int i;
int ret = 0; int ret = 0;
int error = 0;
struct cache_tree *inode_cache; struct cache_tree *inode_cache;
struct shared_node *active_node; struct shared_node *active_node;
@ -1268,8 +1269,10 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
default: default:
break; break;
}; };
if (ret != 0)
error = 1;
} }
return ret; return error;
} }
static void reada_walk_down(struct btrfs_root *root, static void reada_walk_down(struct btrfs_root *root,