| Message ID | 20180126083519.28373-13-suy.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2018年01月26日 16:35, Su Yue wrote: > Counter @error decides return values of check_inode_recs(). > > Previously, @error won't be incremented even repair_inode_recs() failed. > It causes 'btrfs check --repair' prints some error information but > returns 0. > > So, if root dir is missing and repair is disabled, @error should be > incremented. > And after repair_inode_recs(), increase @error if any errors in inodes > and backrefs. > > Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > cmds-check.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/cmds-check.c b/cmds-check.c > index b23a4493b12b..a83f0a92f48b 100644 > --- a/cmds-check.c > +++ b/cmds-check.c > @@ -4137,6 +4137,7 @@ static int check_inode_recs(struct btrfs_root *root, > return -EAGAIN; > } > > + error++; > fprintf(stderr, "root %llu root dir %llu not found\n", > (unsigned long long)root->root_key.objectid, > (unsigned long long)root_dirid); > @@ -4176,10 +4177,9 @@ static int check_inode_recs(struct btrfs_root *root, > free_inode_rec(rec); > continue; > } > - ret = 0; > } > > - if (!(repair && ret == 0)) > + if (rec->errors) > error++; > print_inode_error(root, rec); > list_for_each_entry(backref, &rec->backrefs, list) { > @@ -4189,6 +4189,8 @@ static int check_inode_recs(struct btrfs_root *root, > backref->errors |= REF_ERR_NO_DIR_INDEX; > if (!backref->found_inode_ref) > backref->errors |= REF_ERR_NO_INODE_REF; > + if (backref->errors) > + error++; > fprintf(stderr, "\tunresolved ref dir %llu index %llu" > " namelen %u name %s filetype %d errors %x", > (unsigned long long)backref->dir, >
diff --git a/cmds-check.c b/cmds-check.c index b23a4493b12b..a83f0a92f48b 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -4137,6 +4137,7 @@ static int check_inode_recs(struct btrfs_root *root, return -EAGAIN; } + error++; fprintf(stderr, "root %llu root dir %llu not found\n", (unsigned long long)root->root_key.objectid, (unsigned long long)root_dirid); @@ -4176,10 +4177,9 @@ static int check_inode_recs(struct btrfs_root *root, free_inode_rec(rec); continue; } - ret = 0; } - if (!(repair && ret == 0)) + if (rec->errors) error++; print_inode_error(root, rec); list_for_each_entry(backref, &rec->backrefs, list) { @@ -4189,6 +4189,8 @@ static int check_inode_recs(struct btrfs_root *root, backref->errors |= REF_ERR_NO_DIR_INDEX; if (!backref->found_inode_ref) backref->errors |= REF_ERR_NO_INODE_REF; + if (backref->errors) + error++; fprintf(stderr, "\tunresolved ref dir %llu index %llu" " namelen %u name %s filetype %d errors %x", (unsigned long long)backref->dir,
Counter @error decides return values of check_inode_recs(). Previously, @error won't be incremented even repair_inode_recs() failed. It causes 'btrfs check --repair' prints some error information but returns 0. So, if root dir is missing and repair is disabled, @error should be incremented. And after repair_inode_recs(), increase @error if any errors in inodes and backrefs. Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com> --- cmds-check.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)