From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs: qgroup: Init flags with RESCAN bit at quota enable time
Date: Thu, 26 Jul 2018 17:15:04 +0800 [thread overview]
Message-ID: <20180726091504.5833-1-wqu@suse.com> (raw)
Between btrfs_quota_enable() finished and rescan kicked in, there is a
small window that quota status has (ON | INCONSISTENT) bits set but
without RESCAN bits set.
And transaction is committed inside the window and then power loss
happens, we will have a quota tree with all qgroup numbers set to 0, and
not RESCAN bit set.
At next mount time, qgroup rescan will not kick in due to the missing of
RESCAN bit, user needs to kick in rescan manually.
This patch will fix it by setting RESCAN bit at btrfs_quota_enable(),
so even after power loss we will still kick in rescan automatically.
Suggested-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/qgroup.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index c25dc47210a3..13c1c7dd278d 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -930,7 +930,8 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans,
btrfs_set_qgroup_status_generation(leaf, ptr, trans->transid);
btrfs_set_qgroup_status_version(leaf, ptr, BTRFS_QGROUP_STATUS_VERSION);
fs_info->qgroup_flags = BTRFS_QGROUP_STATUS_FLAG_ON |
- BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
+ BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT |
+ BTRFS_QGROUP_STATUS_FLAG_RESCAN;
btrfs_set_qgroup_status_flags(leaf, ptr, fs_info->qgroup_flags);
btrfs_set_qgroup_status_rescan(leaf, ptr, 0);
@@ -987,7 +988,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans,
fs_info->quota_root = quota_root;
set_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
spin_unlock(&fs_info->qgroup_lock);
- ret = qgroup_rescan_init(fs_info, 0, 1);
+ ret = qgroup_rescan_init(fs_info, 0, 0);
if (!ret) {
qgroup_rescan_zero_tracking(fs_info);
btrfs_queue_work(fs_info->qgroup_rescan_workers,
--
2.18.0
next reply other threads:[~2018-07-26 10:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 9:15 Qu Wenruo [this message]
2018-07-27 1:10 ` [PATCH] btrfs: qgroup: Init flags with RESCAN bit at quota enable time Misono Tomohiro
2018-07-27 1:19 ` Qu Wenruo
2018-07-27 1:43 ` Misono Tomohiro
2018-07-27 6:09 ` Qu Wenruo
2018-07-27 6:47 ` Misono Tomohiro
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=20180726091504.5833-1-wqu@suse.com \
--to=wqu@suse.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox