* [PATCH] btrfs-progs: Preserve process_one_leaf return value.
@ 2014-02-07 18:53 Mitch Harder
0 siblings, 0 replies; only message in thread
From: Mitch Harder @ 2014-02-07 18:53 UTC (permalink / raw)
To: linux-btrfs; +Cc: Mitch Harder
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>
---
cmds-check.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmds-check.c b/cmds-check.c
index 2911af0..eef7c6c 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -1219,6 +1219,7 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
u32 nritems;
int i;
int ret = 0;
+ int error = 0;
struct cache_tree *inode_cache;
struct shared_node *active_node;
@@ -1268,8 +1269,10 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
default:
break;
};
+ if (ret != 0)
+ error = 1;
}
- return ret;
+ return error;
}
static void reada_walk_down(struct btrfs_root *root,
--
1.8.3.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-07 18:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-07 18:53 [PATCH] btrfs-progs: Preserve process_one_leaf return value Mitch Harder
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).