RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: balance: fix some cases wrongly parsed as old syntax 

Some cases of 'btrfs balance' are wrongly parsed as old syntax.
  $ btrfs balance status
  ERROR: cannot access 'status': No such file or directory

Currently, only 'start' is successfully excluded in the check of old
syntax.  Fix it by adding others in the check of old syntax.

Signed-off-by: Wang Yugui <wangyugui@e16-tech.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Wang Yugui 2022-09-14 13:58:46 +08:00 committed by David Sterba
parent 7647192c23
commit 6f7151f499
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmds/balance.c
View File

@ -865,8 +865,24 @@ static const struct cmd_group balance_cmd_group = {
static int cmd_balance(const struct cmd_struct *cmd, int argc, char **argv) static int cmd_balance(const struct cmd_struct *cmd, int argc, char **argv)
{ {
if (argc == 2 && strcmp("start", argv[1]) != 0) { bool old_syntax = true;
/* old 'btrfs filesystem balance <path>' syntax */
/*
* Exclude all valid subcommands from being potentially confused as path
* for the obsolete syntax: btrfs balance <path>
*/
if (argc >= 2) {
for (int i = 0; balance_cmd_group.commands[i] != NULL; i++) {
if (strcmp(argv[1], balance_cmd_group.commands[i]->token) == 0) {
old_syntax = false;
break;
}
}
} else {
old_syntax = false;
}
if (old_syntax) {
struct btrfs_ioctl_balance_args args; struct btrfs_ioctl_balance_args args;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));