From bbf1e8a400d73b5ff2047a584b79db9d3392dc5c Mon Sep 17 00:00:00 2001 From: Su Yue Date: Thu, 8 Feb 2018 11:27:21 +0800 Subject: btrfs-progs: check: lowmem: record returned errors after walk_down_tree_v2 In lowmem mode with '--repair', check_chunks_and_extents_v2 will fix accounting in block groups and clear the error bit BG_ACCOUNTING_ERROR. However, return value of check_btrfs_root() doesn't contain error bits. If extent tree is on error, lowmem repair always prints error and returns nonzero value even the filesystem is fine after repair. Introduce FATAL_ERROR for lowmem mode to represent negative return values since negative and positive can't be mixed in the bit operations. Then let check_btrfs_root() return error bits. Signed-off-by: Su Yue Signed-off-by: David Sterba --- check/mode-lowmem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'check/mode-lowmem.c') diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 39d12ddc..894c42d1 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -4276,7 +4276,7 @@ out: * otherwise means check fs tree(s) items relationship and * @root MUST be a fs tree root. * Returns 0 represents OK. - * Returns not 0 represents error. + * Returns >0 represents error bits. */ static int check_btrfs_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, unsigned int ext_ref, @@ -4299,7 +4299,7 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans, */ ret = check_fs_first_inode(root, ext_ref); if (ret < 0) - return ret; + return FATAL_ERROR; } @@ -4327,11 +4327,11 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans, ret = walk_down_tree(trans, root, &path, &level, &nrefs, ext_ref, check_all); - err |= !!ret; - + if (ret > 0) + err |= ret; /* if ret is negative, walk shall stop */ if (ret < 0) { - ret = err; + ret = err | FATAL_ERROR; break; } -- cgit v1.2.3