RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-01 22:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: lowmem: record returned errors after walk_down_tree_v2

Browse Source 
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>
This commit is contained in:
Su Yue 2018-02-08 11:27:21 +08:00 committed by David Sterba
parent 3f00e00912
commit bbf1e8a400
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
check/mode-lowmem.c
View File

@ -4276,7 +4276,7 @@ out:
* otherwise means check fs tree(s) items relationship and * otherwise means check fs tree(s) items relationship and
* @root MUST be a fs tree root. * @root MUST be a fs tree root.
* Returns 0 represents OK. * Returns 0 represents OK.
* Returns not 0 represents error. * Returns >0 represents error bits.
*/ */
static int check_btrfs_root(struct btrfs_trans_handle *trans, static int check_btrfs_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root, unsigned int ext_ref, 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); ret = check_fs_first_inode(root, ext_ref);
if (ret < 0) 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, ret = walk_down_tree(trans, root, &path, &level, &nrefs,
ext_ref, check_all); ext_ref, check_all);
err |= !!ret; if (ret > 0)
err |= ret;
/* if ret is negative, walk shall stop */ /* if ret is negative, walk shall stop */
if (ret < 0) { if (ret < 0) {
ret = err; ret = err | FATAL_ERROR;
break; break;
} }

1
check/mode-lowmem.h
View File

@ -43,6 +43,7 @@
#define DIR_INDEX_MISMATCH (1<<19) /* INODE_INDEX found but not match */ #define DIR_INDEX_MISMATCH (1<<19) /* INODE_INDEX found but not match */
#define DIR_COUNT_AGAIN (1<<20) /* DIR isize should be recalculated */ #define DIR_COUNT_AGAIN (1<<20) /* DIR isize should be recalculated */
#define BG_ACCOUNTING_ERROR (1<<21) /* Block group accounting error */ #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. * Error bit for low memory mode check.