diff options
| author | Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> | 2016-03-14 09:15:42 +0900 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-03-14 13:42:47 +0100 |
| commit | 1a521af045390b0f21356609d67cb8b3f7ccf837 (patch) | |
| tree | 99af8beeb9e2a0357dec7cd3e378b386d7904834 | |
| parent | cfa4b5bc4d1faedf2187f1377291122a7243e64f (diff) | |
btrfs-progs: Fix a regression that btrfs filesystem label doesn't work
The number of arguments which is allowed to pass became wrong
from the following commit.
commit 176aeca9a148c5e29de0 ("btrfs-progs: add getopt stubs where needed")
* actual result
===========================================================
# ./btrfs prop get /btrfs label
label=foo
# ./btrfs fi label /btrfs
btrfs filesystem label: too few arguments
usage: btrfs filesystem label [<device>|<mount_point>] [<newlabel>]
Get or change the label of a filesystem
With one argument, get the label of filesystem on <device>.
If <newlabel> is passed, set the filesystem label to <newlabel>.
# ./btrfs fi label /btrfs bar
foo
# ./btrfs prop get /btrfs label
label=foo
===========================================================
* expected result
===========================================================
# ./btrfs prop get /btrfs label
label=foo
# ./btrfs fi label /btrfs
foo
# ./btrfs fi label /btrfs bar
# ./btrfs prop get /btrfs label
label=bar
===========================================================
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | cmds-filesystem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 7e74e1b4..45c16d27 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -1255,11 +1255,11 @@ static int cmd_filesystem_label(int argc, char **argv) { clean_args_no_options(argc, argv, cmd_filesystem_label_usage); - if (check_argc_min(argc - optind, 2) || - check_argc_max(argc - optind, 3)) + if (check_argc_min(argc - optind, 1) || + check_argc_max(argc - optind, 2)) usage(cmd_filesystem_label_usage); - if (argc - optind > 2) { + if (argc - optind > 1) { return set_label(argv[optind], argv[optind + 1]); } else { char label[BTRFS_LABEL_SIZE]; |