@@ -1319,8 +1319,7 @@ void report_qgroups(int all)
while (node) {
c = rb_entry(node, struct qgroup_count, rb_node);
- if (report_qgroup_difference(c, all))
- list_add_tail(&c->bad_list, &bad_qgroups);
+ report_qgroup_difference(c, all);
node = rb_next(node);
}
@@ -1358,9 +1357,20 @@ void free_qgroup_counts(void)
}
}
+static bool is_bad_qgroup(struct qgroup_count *count)
+{
+ struct qgroup_info *info = &count->info;
+ struct qgroup_info *disk = &count->diskinfo;
+ s64 excl_diff = info->exclusive - disk->exclusive;
+ s64 ref_diff = info->referenced - disk->referenced;
+
+ return (excl_diff || ref_diff);
+}
+
int qgroup_verify_all(struct btrfs_fs_info *info)
{
int ret;
+ struct rb_node *node;
if (!info->quota_enabled)
return 0;
@@ -1395,6 +1405,20 @@ int qgroup_verify_all(struct btrfs_fs_info *info)
ret = account_all_refs(1, 0);
+ /*
+ * Do the correctness check here, so for callers who don't want
+ * verbose report can skip calling report_qgroups()
+ */
+ node = rb_first(&counts.root);
+ while (node) {
+ struct qgroup_count *c;
+
+ c = rb_entry(node, struct qgroup_count, rb_node);
+ if (is_bad_qgroup(c))
+ list_add_tail(&c->bad_list, &bad_qgroups);
+ node = rb_next(node);
+ }
+
out:
/*
* Don't free the qgroup count records as they will be walked
The original qgroup-verify integrates qgroup classification into report_qgroups(). This behavior makes silent qgroup repair (or offline rescan) impossible. To repair qgroup, we must call report_qgroups() to trigger bad qgroup classification, which will output error message. This patch moves bad qgroup classification from report_qgroups() to qgroup_verify_all(). The functionality is not changed, but provides the basis for later silent qgroup repair. Signed-off-by: Qu Wenruo <wqu@suse.com> --- qgroup-verify.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)