Linux Btrfs filesystem development
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs-progs: parse-utils: allow single number qgroup id
Date: Mon, 11 Oct 2021 15:09:37 +0800	[thread overview]
Message-ID: <20211011070937.32419-1-wqu@suse.com> (raw)

[BUG]
Since btrfs-progs v5.14, fstests/btrfs/099 always fail with the
following output in 099.full:

  ...
  # /usr/bin/btrfs quota enable /mnt/scratch
  # /usr/bin/btrfs qgroup limit 134217728 5 /mnt/scratch
  ERROR: invalid qgroupid or subvolume path: 5
  failed: '/usr/bin/btrfs qgroup limit 134217728 5 /mnt/scratch'

[CAUSE]
Since commit cb5a542871f9 ("btrfs-progs: factor out plain qgroupid
parsing"), btrfs qgroup parser no longer accepts single number qgroup id
like "5" used in that test case.

That commit is not a plain refactor without functional change, but
removed a simple feature.

[FIX]
Add back the handling for single number qgroupid.

Fixes: cb5a542871f9 ("btrfs-progs: factor out plain qgroupid parsing")
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 common/parse-utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/parse-utils.c b/common/parse-utils.c
index ad57b74a7b64..863ca9f25fd8 100644
--- a/common/parse-utils.c
+++ b/common/parse-utils.c
@@ -290,6 +290,12 @@ int parse_qgroupid(const char *str, u64 *qgroupid)
 	level = strtoull(str, &end, 10);
 	if (str == end)
 		return -EINVAL;
+	/* We accept single qgroupid like "5", to indicate "0/5"*/
+	if (end[0] == '\0') {
+		*qgroupid = level;
+		return 0;
+	}
+	/* Otherwise qgroupid must go like "1/256" */
 	if (end[0] != '/')
 		return -EINVAL;
 	str = end + 1;
-- 
2.33.0


             reply	other threads:[~2021-10-11  7:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-11  7:09 Qu Wenruo [this message]
2021-10-11  7:32 ` [PATCH] btrfs-progs: parse-utils: allow single number qgroup id Nikolay Borisov
2021-10-11 13:21 ` David Sterba
2021-10-12 10:59   ` Qu Wenruo
2021-10-13 12:42     ` David Sterba
2021-10-13 12:55       ` Qu Wenruo

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=20211011070937.32419-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