marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs-progs: fix arg parsing for btrfs qgroup limit commands 

We can use this command in two ways.
1. btrfs qgroup limit size qgroupid path
2. btrfs qgroup limit size path

Before applying this patch, we differentiate them by check the parsing result
of the second argument. It is not so good because it may make some mistakes,
For example:
  btrfs qgroup limit 1M 123456
 			^ It is a subvolume name.

In fact, we can differentiate them just by the number of arguments, so fix it
by this way.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Gene Czarcinski <gene@czarc.net>
master
Wang Shilong 2013-01-20 16:04:14 -05:00 committed by David Sterba
parent c9597c7f17
commit f933e084ea
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmds-qgroup.c
View File

@ -383,7 +383,6 @@ static int cmd_qgroup_limit(int argc, char **argv)
}
memset(&args, 0, sizeof(args));
args.qgroupid = parse_qgroupid(argv[optind + 1]);
if (size) {
if (compressed)
args.lim.flags |= BTRFS_QGROUP_LIMIT_RFER_CMPR |
@ -397,9 +396,8 @@ static int cmd_qgroup_limit(int argc, char **argv)
}
}
if (args.qgroupid == 0) {
if (check_argc_exact(argc - optind, 2))
usage(cmd_qgroup_limit_usage);
if (argc - optind == 2) {
args.qgroupid = 0;
path = argv[optind + 1];
ret = test_issubvolume(path);
if (ret < 0) {
@ -415,11 +413,11 @@ static int cmd_qgroup_limit(int argc, char **argv)
* keep qgroupid at 0, this indicates that the subvolume the
* fd refers to is to be limited
*/
} else {
if (check_argc_exact(argc - optind, 3))
usage(cmd_qgroup_limit_usage);
} else if (argc - optind == 3) {
args.qgroupid = parse_qgroupid(argv[optind + 1]);
path = argv[optind + 2];
}
} else
usage(cmd_qgroup_limit_usage);
fd = open_file_or_dir(path);
if (fd < 0) {