btrfs-progs: Fix return value bug of qgroups check

Before this patch, although btrfsck will check qgroups if quota is
enabled, it always return 0 even qgroup numbers are corrupted.

Fix it by allowing return value from report_qgroups function (formally
defined as print_qgroup_difference).

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/cmds-check.c b/cmds-check.c
index ded193e35ad8d9617c1c107907ed17be5866fd1b..127ac977bf0a44ce6d3dabd93a6f59cc2bd84250 100644 (file)
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -9671,7 +9671,7 @@ int cmd_check(int argc, char **argv)
                       uuidbuf);
                ret = qgroup_verify_all(info);
                if (ret == 0)
-                       print_qgroup_report(1);
+                       ret = report_qgroups(1);
                goto close_out;
        }
        if (subvolid) {
@@ -9832,7 +9832,11 @@ int cmd_check(int argc, char **argv)
                ret = 1;
        }
 out:
-       print_qgroup_report(0);
+       /* Don't override original ret */
+       if (ret)
+               report_qgroups(0);
+       else
+               ret = report_qgroups(0);
        if (found_old_backref) { /*
                 * there was a disk format change when mixed
                 * backref was in testing tree. The old format

diff --git a/qgroup-verify.c b/qgroup-verify.c
index 10ff8e038eef102fdfa57f5b1a9d45b210675890..c4e9201e691218341043282f58d0c8b32a676c80 100644 (file)
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -1016,7 +1016,7 @@ static void print_fields_signed(long long bytes,
               prefix, type, bytes, type, bytes_compressed);
 }
 
-static void print_qgroup_difference(struct qgroup_count *count, int verbose)
+static int report_qgroup_difference(struct qgroup_count *count, int verbose)
 {
        int is_different;
        struct qgroup_info *info = &count->info;
@@ -1046,19 +1046,22 @@ static void print_qgroup_difference(struct qgroup_count *count, int verbose)
                        print_fields_signed(excl_diff, excl_diff,
                                            "diff:", "exclusive");
        }
+       return (is_different && count->subvol_exists);
 }
 
-void print_qgroup_report(int all)
+int report_qgroups(int all)
 {
        struct rb_node *node;
        struct qgroup_count *c;
+       int ret = 0;
 
        node = rb_first(&counts.root);
        while (node) {
                c = rb_entry(node, struct qgroup_count, rb_node);
-               print_qgroup_difference(c, all);
+               ret |= report_qgroup_difference(c, all);
                node = rb_next(node);
        }
+       return ret;
 }
 
 int qgroup_verify_all(struct btrfs_fs_info *info)

diff --git a/qgroup-verify.h b/qgroup-verify.h
index 7d91c1971c82cd2701efd3b6a85a9cfcdb5c1222..37474650c7597b013cbc9978cae5a668925f8ef5 100644 (file)
--- a/qgroup-verify.h
+++ b/qgroup-verify.h
@@ -23,7 +23,7 @@
 #include "ctree.h"
 
 int qgroup_verify_all(struct btrfs_fs_info *info);
-void print_qgroup_report(int all);
+int report_qgroups(int all);
 
 int print_extent_state(struct btrfs_fs_info *info, u64 subvol);