From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 4/8] btrfs-progs: qgroup-verify: Allow repair_qgroups function to do silent repair
Date: Fri, 27 Oct 2017 15:29:32 +0800 [thread overview]
Message-ID: <20171027072936.4697-5-wqu@suse.com> (raw)
In-Reply-To: <20171027072936.4697-1-wqu@suse.com>
Allow repair_qgroups() to do silent repair, so it can acts as offline
qgroup rescan.
This provides the basis for later mkfs quota support.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
cmds-check.c | 2 +-
qgroup-verify.c | 19 +++++++++++--------
qgroup-verify.h | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index 5c822b848608..955049b95f3c 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -13360,7 +13360,7 @@ int cmd_check(int argc, char **argv)
goto out;
}
report_qgroups(0);
- ret = repair_qgroups(info, &qgroups_repaired);
+ ret = repair_qgroups(info, &qgroups_repaired, false);
err |= !!ret;
if (err) {
error("failed to repair quota groups");
diff --git a/qgroup-verify.c b/qgroup-verify.c
index 67bd8b96ddd3..bb77eac139aa 100644
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -1498,7 +1498,7 @@ out:
}
static int repair_qgroup_info(struct btrfs_fs_info *info,
- struct qgroup_count *count)
+ struct qgroup_count *count, bool silent)
{
int ret;
struct btrfs_root *root = info->quota_root;
@@ -1507,8 +1507,10 @@ static int repair_qgroup_info(struct btrfs_fs_info *info,
struct btrfs_qgroup_info_item *info_item;
struct btrfs_key key;
- printf("Repair qgroup %llu/%llu\n", btrfs_qgroup_level(count->qgroupid),
- btrfs_qgroup_subvid(count->qgroupid));
+ if (!silent)
+ printf("Repair qgroup %llu/%llu\n",
+ btrfs_qgroup_level(count->qgroupid),
+ btrfs_qgroup_subvid(count->qgroupid));
trans = btrfs_start_transaction(root, 1);
if (IS_ERR(trans))
@@ -1553,7 +1555,7 @@ out:
return ret;
}
-static int repair_qgroup_status(struct btrfs_fs_info *info)
+static int repair_qgroup_status(struct btrfs_fs_info *info, bool silent)
{
int ret;
struct btrfs_root *root = info->quota_root;
@@ -1562,7 +1564,8 @@ static int repair_qgroup_status(struct btrfs_fs_info *info)
struct btrfs_key key;
struct btrfs_qgroup_status_item *status_item;
- printf("Repair qgroup status item\n");
+ if (!silent)
+ printf("Repair qgroup status item\n");
trans = btrfs_start_transaction(root, 1);
if (IS_ERR(trans))
@@ -1599,7 +1602,7 @@ out:
return ret;
}
-int repair_qgroups(struct btrfs_fs_info *info, int *repaired)
+int repair_qgroups(struct btrfs_fs_info *info, int *repaired, bool silent)
{
int ret = 0;
struct qgroup_count *count, *tmpcount;
@@ -1610,7 +1613,7 @@ int repair_qgroups(struct btrfs_fs_info *info, int *repaired)
return 0;
list_for_each_entry_safe(count, tmpcount, &bad_qgroups, bad_list) {
- ret = repair_qgroup_info(info, count);
+ ret = repair_qgroup_info(info, count, silent);
if (ret) {
goto out;
}
@@ -1626,7 +1629,7 @@ int repair_qgroups(struct btrfs_fs_info *info, int *repaired)
* mount.
*/
if (*repaired || counts.qgroup_inconsist || counts.rescan_running) {
- ret = repair_qgroup_status(info);
+ ret = repair_qgroup_status(info, silent);
if (ret)
goto out;
diff --git a/qgroup-verify.h b/qgroup-verify.h
index d7d83a46ed5a..7e5697024f31 100644
--- a/qgroup-verify.h
+++ b/qgroup-verify.h
@@ -24,7 +24,7 @@
int qgroup_verify_all(struct btrfs_fs_info *info);
void report_qgroups(int all);
-int repair_qgroups(struct btrfs_fs_info *info, int *repaired);
+int repair_qgroups(struct btrfs_fs_info *info, int *repaired, bool silent);
int print_extent_state(struct btrfs_fs_info *info, u64 subvol);
--
2.14.3
next prev parent reply other threads:[~2017-10-27 7:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 7:29 [PATCH 0/8] mkfs: Quota support Qu Wenruo
2017-10-27 7:29 ` [PATCH 1/8] btrfs-progs: qgroup-verify: Also repair qgroup status version Qu Wenruo
2017-10-27 7:29 ` [PATCH 2/8] btrfs-progs: qgroup-verify: Use fs_info->readonly to check if we should repair qgroups Qu Wenruo
2017-10-27 7:29 ` [PATCH 3/8] btrfs-progs: qgroup-verify: Move qgroup classification out of report_qgroups Qu Wenruo
2017-11-04 14:20 ` Lu Fengqi
2017-10-27 7:29 ` Qu Wenruo [this message]
2017-10-27 7:29 ` [PATCH 5/8] btrfs-progs: ctree: Introduce function to create an empty tree Qu Wenruo
2017-11-03 9:12 ` Lu Fengqi
2017-10-27 7:29 ` [PATCH 6/8] btrfs-progs: mkfs: Introduce function to insert qgroup info and limit items Qu Wenruo
2017-10-27 7:29 ` [PATCH 7/8] btrfs-progs: mkfs: Introduce option to enable quota at mkfs time Qu Wenruo
2017-10-27 7:29 ` [PATCH 8/8] btrfs-progs: test/mkfs: Add test case for --enable-quota option Qu Wenruo
2017-10-27 17:37 ` [PATCH 0/8] mkfs: Quota support David Sterba
2017-10-27 23:57 ` Qu Wenruo
2017-11-01 7:18 ` Qu Wenruo
2017-11-04 14:28 ` Lu Fengqi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171027072936.4697-5-wqu@suse.com \
--to=wqu@suse.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.