Re: [PATCH 1/3] btrfs-progs: scan /proc/partitions not all of /dev with "-d"

[Anand Jain <Anand.Jain@oracle.com>]

Reviewed-by: Anand Jain <anand.jain@oracle.com>

On 21/08/2014 06:22, Eric Sandeen wrote:
> We can scan for btrfs devices in a few ways.  By default
> libblkid is used for "device scan" and "filesystem show";
> with the -m option only mounted filesystems are scanned,
> and with -d we physically read every system device.
>
> But there's no reason for the complexity of a descent through
> /dev; /proc/partitions has every device known to the kernel, so
> just use that when -d is specified.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
> diff --git a/cmds-device.c b/cmds-device.c
> index b6772b9..519681a 100644
> --- a/cmds-device.c
> +++ b/cmds-device.c
> @@ -224,7 +224,7 @@ static int cmd_scan_dev(int argc, char **argv)
>   			break;
>   		switch (c) {
>   		case 'd':
> -			where = BTRFS_SCAN_DEV;
> +			where = BTRFS_SCAN_PROC;
>   			all = 1;
>   			break;
>   		default:
> diff --git a/cmds-filesystem.c b/cmds-filesystem.c
> index bf87bbe..0ad7e8f 100644
> --- a/cmds-filesystem.c
> +++ b/cmds-filesystem.c
> @@ -614,7 +614,7 @@ static int cmd_show(int argc, char **argv)
>   			break;
>   		switch (c) {
>   		case 'd':
> -			where = BTRFS_SCAN_DEV;
> +			where = BTRFS_SCAN_PROC;
>   			break;
>   		case 'm':
>   			where = BTRFS_SCAN_MOUNTED;
> @@ -638,7 +638,7 @@ static int cmd_show(int argc, char **argv)
>   		 * right away
>   		 */
>   		if (type == BTRFS_ARG_BLKDEV) {
> -			if (where == BTRFS_SCAN_DEV) {
> +			if (where == BTRFS_SCAN_PROC) {
>   				/* we need to do this because
>   				 * legacy BTRFS_SCAN_DEV
>   				 * provides /dev/dm-x paths
> @@ -681,7 +681,7 @@ static int cmd_show(int argc, char **argv)
>   		}
>   	}
>
> -	if (where == BTRFS_SCAN_DEV)
> +	if (where == BTRFS_SCAN_PROC)
>   		goto devs_only;
>
>   	/* show mounted btrfs */
>
> --
> 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
>