From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
To: Yauhen Kharuzhy <yauhen.kharuzhy@zavadatar.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] Fix broken 'device scan' arguments parsing
Date: Wed, 9 Mar 2016 17:24:16 +0900 [thread overview]
Message-ID: <56DFDDB0.5090207@jp.fujitsu.com> (raw)
In-Reply-To: <1457486380-4051-1-git-send-email-yauhen.kharuzhy@zavadatar.com>
On 2016/03/09 10:19, Yauhen Kharuzhy wrote:
> commit 52179e4fea41e55f31c92cd033a0b53a5107b4f4 'btrfs-progs: unify argc
> min/max checking' brokes 'btrfs device scan' command when no argument
> was given. Fix this.
>
> Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@zavadatar.com>
> ---
> cmds-device.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cmds-device.c b/cmds-device.c
> index cb470af..94ffdc5 100644
> --- a/cmds-device.c
> +++ b/cmds-device.c
> @@ -273,7 +273,7 @@ static int cmd_device_scan(int argc, char **argv)
> if (all && check_argc_max(argc - optind, 1))
It's better to the above line as follows.
========
if (all && check_argc_exact(argc - optind, 0))
========
> usage(cmd_device_scan_usage);
>
> - if (all || argc - optind == 1) {
> + if (all || argc - optind == 0) {
> printf("Scanning for Btrfs filesystems\n");
> ret = btrfs_scan_lblkid();
> error_on(ret, "error %d while scanning", ret);
>
Here is the test result.
* v4.4.1
======================
# ./btrfs device scan
Scanning for Btrfs filesystems
# ./btrfs device scan -d
Scanning for Btrfs filesystems
# ./btrfs device scan -d foo
btrfs device scan: too many arguments
usage: btrfs device scan [(-d|--all-devices)|<device> [<device>...]]
Scan devices for a btrfs filesystem
-d|--all-devices (deprecated)
==========================
* devel branch with this patch.
==========================
# ./btrfs device scan
Scanning for Btrfs filesystems
# ./btrfs device scan -d
Scanning for Btrfs filesystems
# ./btrfs device scan -d foo
Scanning for Btrfs filesystems
===========================
* devel branch without this patch.
==================
# ./btrfs device scan
# ./btrfs device scan -d
Scanning for Btrfs filesystems
# ./btrfs device scan -d foo
Scanning for Btrfs filesystems
===================
* devel branch with this patch and my patch.
=========================
# ./btrfs device scan
Scanning for Btrfs filesystems
# ./btrfs device scan -d
Scanning for Btrfs filesystems
# ./btrfs device scan -d foo
btrfs device scan: too many arguments
usage: btrfs device scan [(-d|--all-devices)|<device> [<device>...]]
Scan devices for a btrfs filesystem
-d|--all-devices (deprecated)
===========================
Thanks,
Satoru
next prev parent reply other threads:[~2016-03-09 8:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 1:19 [PATCH] Fix broken 'device scan' arguments parsing Yauhen Kharuzhy
2016-03-09 8:24 ` Satoru Takeuchi [this message]
2016-03-09 13:19 ` David Sterba
2016-03-09 13:35 ` David Sterba
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=56DFDDB0.5090207@jp.fujitsu.com \
--to=takeuchi_satoru@jp.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=yauhen.kharuzhy@zavadatar.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.