diff options
author | Su Yue <suy.fnst@cn.fujitsu.com> | 2018-02-08 11:27:21 +0800 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-06-07 16:32:03 +0200 |
commit | bbf1e8a400d73b5ff2047a584b79db9d3392dc5c (patch) | |
tree | 4e4716ff417f9b1615434eb0bbf20745c9da9f4f /check | |
parent | 3f00e009122ab8cf9f50491daa016a073dafa775 (diff) |
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 <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'check')
-rw-r--r-- | check/mode-lowmem.c | 10 | ||||
-rw-r--r-- | check/mode-lowmem.h | 1 |
2 files changed, 6 insertions, 5 deletions
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; } diff --git a/check/mode-lowmem.h b/check/mode-lowmem.h index 73d57999..e7ba62e2 100644 --- a/check/mode-lowmem.h +++ b/check/mode-lowmem.h @@ -43,6 +43,7 @@ #define DIR_INDEX_MISMATCH (1<<19) /* INODE_INDEX found but not match */ #define DIR_COUNT_AGAIN (1<<20) /* DIR isize should be recalculated */ #define BG_ACCOUNTING_ERROR (1<<21) /* Block group accounting error */ +#define FATAL_ERROR (1<<22) /* Fatal bit for errno */ /* * Error bit for low memory mode check. |