From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs: qgroup: Automatically remove qgroup item when dropping a subvolume
Date: Thu, 17 Oct 2019 15:36:59 +0800 [thread overview]
Message-ID: <20191017073659.37687-1-wqu@suse.com> (raw)
[BUG]
When a subvolume is created, we automatically create a level 0 qgroup
for it, but don't remove it when the subvolume is dropped.
Although it's not a big deal, it can easily pollute the output of
"btrfs qgroup show" and make it pretty annoying.
[FIX]
For btrfs_drop_snapshot(), if it's a valid subvolume (not a reloc tree)
and qgroup is enabled, we do the following work to remove the qgroup:
- Commit transaction
This is to ensure that the qgroup numbers of that subvolume is updated
properly (all number of that subvolume should be 0).
- Start a new transaction for later operation
- Call btrfs_remove_qgroup()
So that qgroup can be automatically removed when the subvolume get fully
dropped.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/extent-tree.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 49cb26fa7c63..5e8569cad16d 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5182,6 +5182,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
struct btrfs_root_item *root_item = &root->root_item;
struct walk_control *wc;
struct btrfs_key key;
+ u64 rootid = root->root_key.objectid;
int err = 0;
int ret;
int level;
@@ -5384,6 +5385,30 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
}
root_dropped = true;
out_end_trans:
+ /* If qgroup is enabled, also try to remove the qgroup */
+ if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) && root_dropped &&
+ is_fstree(rootid) && !for_reloc) {
+ /* Commit transaction so qgroup numbers get updated to all 0 */
+ ret = btrfs_commit_transaction(trans);
+ if (ret < 0) {
+ btrfs_end_transaction_throttle(trans);
+ err = ret;
+ goto out_free;
+ }
+ trans = btrfs_start_transaction(fs_info->quota_root, 1);
+ if (IS_ERR(trans)) {
+ err = PTR_ERR(trans);
+ goto out_free;
+ }
+
+ /*
+ * Here we ignore the return value of btrfs_remove_qgroup(),
+ * as there is no critical error could happen.
+ * Error like EINVAL (quota disabled) or ENOENT (no such qgroup)
+ * are all safe to ignore.
+ */
+ btrfs_remove_qgroup(trans, rootid);
+ }
btrfs_end_transaction_throttle(trans);
out_free:
kfree(wc);
--
2.23.0
next reply other threads:[~2019-10-17 7:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 7:36 Qu Wenruo [this message]
2020-02-03 7:06 ` [PATCH] btrfs: qgroup: Automatically remove qgroup item when dropping a subvolume Qu Wenruo
2020-02-03 16:36 ` Josef Bacik
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=20191017073659.37687-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