From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: Wang Shilong <wangshilong1991@gmail.com>
Cc: linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH 4/7] btrfs-progs: Allow parse_qgroupid() to resolve subvolume path into qgroupid.
Date: Fri, 27 Feb 2015 16:51:37 +0800 [thread overview]
Message-ID: <54F03019.3090808@cn.fujitsu.com> (raw)
In-Reply-To: <B6A95DD2-413F-4C43-8A9B-048713D62BCC@gmail.com>
-------- Original Message --------
Subject: Re: [PATCH 4/7] btrfs-progs: Allow parse_qgroupid() to resolve
subvolume path into qgroupid.
From: Wang Shilong <wangshilong1991@gmail.com>
To: Qu Wenruo <quwenruo@cn.fujitsu.com>
Date: 2015年02月27日 16:41
>
>>
>> Now parse_qgroupid() can resolve subvolume path into qgroupid.
>> This is quite handy for handling level 0 qgroupid, and user don't need
>> to resolve rootid by hand now.
>
> oh, not sure if this is safe, for example, if user do something like:
>
> # btrfs sub create 258(subvolume id = 300)
>
> if 258 is passing, so it will be treated as subvolume id?
Immediate number has higher privilege than path, so 258 is first
considered as a subvolid and path will not be resolved, just as the old
days.
If user really want to do things like that, passing "./258" will be the
best method.
Thanks,
Qu
>
>
>> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
>> ---
>> utils.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
>> 1 file changed, 42 insertions(+), 4 deletions(-)
>>
>> diff --git a/utils.c b/utils.c
>> index fc2791b..509c5ec 100644
>> --- a/utils.c
>> +++ b/utils.c
>> @@ -1708,6 +1708,25 @@ scan_again:
>> }
>>
>> /*
>> + * Unsafe subvolume check.
>> + *
>> + * This only checks ino == BTRFS_FIRST_FREE_OBJECTID, even it is not in a
>> + * btrfs mount point.
>> + * Must use together with other reliable method like btrfs ioctl.
>> + */
>> +static int __is_subvol(char *path)
>> +{
>> + struct stat st;
>> + int ret;
>> +
>> + ret = lstat(path, &st);
>> + if (ret < 0)
>> + return ret;
>> +
>> + return st.st_ino == BTRFS_FIRST_FREE_OBJECTID;
>> +}
>> +
>> +/*
>> * A not-so-good version fls64. No fascinating optimization since
>> * no one except parse_size use it
>> */
>> @@ -1802,24 +1821,43 @@ u64 parse_qgroupid(char *p)
>> char *ptr_parse_end = NULL;
>> u64 level;
>> u64 id;
>> + int fd;
>> + int ret = 0;
>>
>> + if (p[0] == '/')
>> + goto path;
>> +
>> + /* Numeric format like '0/257' is the primary case */
>> if (!s) {
>> id = strtoull(p, &ptr_parse_end, 10);
>> if (ptr_parse_end != ptr_src_end)
>> - goto err;
>> + goto path;
>> return id;
>> }
>> level = strtoull(p, &ptr_parse_end, 10);
>> if (ptr_parse_end != s)
>> - goto err;
>> + goto path;
>>
>> id = strtoull(s+1, &ptr_parse_end, 10);
>> if (ptr_parse_end != ptr_src_end)
>> - goto err;
>> + goto path;
>>
>> return (level << BTRFS_QGROUP_LEVEL_SHIFT) | id;
>> +path:
>> + /* Path format like subv at 'my_subvol' is the fallback case */
>> + ret = __is_subvol(p);
>> + if (ret < 0 || !ret)
>> + goto err;
>> + fd = open(p, O_RDONLY);
>> + if (fd < 0)
>> + goto err;
>> + ret = lookup_ino_rootid(fd, &id);
>> + close(fd);
>> + if (ret < 0)
>> + goto err;
>> + return id;
>> err:
>> - fprintf(stderr, "ERROR:invalid qgroupid\n");
>> + fprintf(stderr, "ERROR:invalid qgroupid or subvolume path\n");
>> exit(-1);
>> }
>>
>> --
>> 2.3.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> Best Regards,
> Wang Shilong
>
next prev parent reply other threads:[~2015-02-27 8:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 8:26 [PATCH 0/7] btrfs-progs: qgroup related enhance Qu Wenruo
2015-02-27 8:26 ` [PATCH 1/7] btrfs-progs: Update qgroup status flags and replace qgroup level/subvid calculation with inline function Qu Wenruo
2015-02-27 8:26 ` [PATCH 2/7] btrfs-progs: Allow btrfs-debug-tree to print human readable qgroup status flag Qu Wenruo
2015-02-27 8:26 ` [PATCH 3/7] btrfs-progs: Move parse_qgroupid() to utils.c Qu Wenruo
2015-02-27 8:26 ` [PATCH 4/7] btrfs-progs: Allow parse_qgroupid() to resolve subvolume path into qgroupid Qu Wenruo
[not found] ` <B6A95DD2-413F-4C43-8A9B-048713D62BCC@gmail.com>
2015-02-27 8:51 ` Qu Wenruo [this message]
2015-02-27 8:26 ` [PATCH 5/7] btrfs-progs: Add stack get/set functions for btrfs_qgroup_status_item Qu Wenruo
2015-02-27 8:26 ` [PATCH 6/7] btrfs-progs: Print warning message if qgroup data is inconsistent Qu Wenruo
2015-05-30 11:39 ` Filipe David Manana
2015-06-01 0:31 ` Qu Wenruo
2015-06-01 1:25 ` Qu Wenruo
2015-06-01 7:49 ` Filipe David Manana
2015-06-03 7:10 ` [PATCH] xfstests: btrfs: 022: add a quota rescan -w to wait rescan finished Dongsheng Yang
2015-06-03 7:12 ` Dongsheng Yang
2015-06-03 15:53 ` Filipe David Manana
2015-02-27 8:26 ` [PATCH 7/7] btrfs-progs: Schedule quota rescan if qgroup assign caused inconsistence Qu Wenruo
2015-03-23 23:38 ` [PATCH 0/7] btrfs-progs: qgroup related enhance David Sterba
2015-03-24 0:36 ` Qu Wenruo
2015-07-27 14:35 ` David Sterba
2015-07-28 0:25 ` 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=54F03019.3090808@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wangshilong1991@gmail.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).