From: Marcos Paulo de Souza <marcos@mpdesouza.com>
To: dsterba@suse.com, wqu@suse.com, linux-btrfs@vger.kernel.org
Subject: [PATCH v4 05/11] btrfs-progs: qgroup-verify: Allow repair_qgroups function to do silent repair
Date: Wed, 18 Mar 2020 17:21:42 -0300 [thread overview]
Message-ID: <20200318202148.14828-6-marcos@mpdesouza.com> (raw)
In-Reply-To: <20200318202148.14828-1-marcos@mpdesouza.com>
From: Qu Wenruo <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>
---
check/main.c | 2 +-
check/qgroup-verify.c | 19 +++++++++++--------
check/qgroup-verify.h | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/check/main.c b/check/main.c
index 7632b60a..375aef8f 100644
--- a/check/main.c
+++ b/check/main.c
@@ -10441,7 +10441,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
goto out;
}
report_qgroups(0);
- ret = repair_qgroups(info, &qgroups_repaired);
+ ret = repair_qgroups(info, &qgroups_repaired, false);
if (ret) {
error("failed to repair quota groups");
goto out;
diff --git a/check/qgroup-verify.c b/check/qgroup-verify.c
index b1e6b26c..b1736aab 100644
--- a/check/qgroup-verify.c
+++ b/check/qgroup-verify.c
@@ -1540,7 +1540,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;
@@ -1549,8 +1549,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))
@@ -1595,7 +1597,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;
@@ -1604,7 +1606,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))
@@ -1641,7 +1644,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;
@@ -1652,7 +1655,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;
}
@@ -1668,7 +1671,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/check/qgroup-verify.h b/check/qgroup-verify.h
index 6495dd18..8a8694b6 100644
--- a/check/qgroup-verify.h
+++ b/check/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.25.0
next prev parent reply other threads:[~2020-03-18 20:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 20:21 [PATCH v4 00/11] btrfs-progs: mkfs: Quota support through -Q|--quota Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 01/11] btrfs-progs: qgroup-verify: Avoid NULL pointer dereference for later silent qgroup repair Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 02/11] btrfs-progs: qgroup-verify: Also repair qgroup status version Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 03/11] btrfs-progs: qgroup-verify: Use fs_info->readonly to check if we should repair qgroups Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 04/11] btrfs-progs: qgroup-verify: Move qgroup classification out of report_qgroups Marcos Paulo de Souza
2020-03-18 20:21 ` Marcos Paulo de Souza [this message]
2020-03-18 20:21 ` [PATCH v4 06/11] btrfs-progs: ctree: Introduce function to create an empty tree Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 07/11] btrfs-progs: mkfs: Introduce function to insert qgroup info and limit items Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 08/11] btrfs-progs: mkfs: Introduce function to setup quota root and rescan Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 09/11] btrfs-progs: mkfs: Introduce mkfs time quota support Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 10/11] btrfs-progs: test/mkfs: Add test case for -Q|--quota option Marcos Paulo de Souza
2020-03-18 20:21 ` [PATCH v4 11/11] btrfs-progs: test/mkfs: Add test case for --rootdir and --quota Marcos Paulo de Souza
2020-05-25 14:43 ` [PATCH v4 00/11] btrfs-progs: mkfs: Quota support through -Q|--quota David Sterba
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=20200318202148.14828-6-marcos@mpdesouza.com \
--to=marcos@mpdesouza.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).