From: Eric Sandeen Date: Wed, 20 Aug 2014 22:22:13 +0000 (-0500) Subject: btrfs-progs: scan /proc/partitions not all of /dev with "-d" X-Git-Tag: upstream/4.16.1~2690 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e85e481887abba8141ff43597c09b5f91d70ee4;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: scan /proc/partitions not all of /dev with "-d" 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 Reviewed-by: Anand Jain Signed-off-by: David Sterba --- diff --git a/cmds-device.c b/cmds-device.c index 0475bf6..b647024 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -223,7 +223,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 0301442..1638f0b 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -568,7 +568,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; @@ -592,7 +592,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 @@ -623,7 +623,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 */