diff options
| author | Anand Jain <anand.jain@oracle.com> | 2014-09-13 09:21:21 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-10-10 10:38:34 +0200 |
| commit | 5444864e5605090be1cdbfb690a9b429fb9c2203 (patch) | |
| tree | b43a778761ed9da9d06f494de6d14cca5f9fea9a /cmds-device.c | |
| parent | 0d84aa903a51c472f273b02da98da2f6160e4289 (diff) | |
btrfs-progs: remove BTRFS_SCAN_PROC scan method
The libblkid scan method which was introduced later, will also
scan devices under /proc/partitions. So we don't have to do
the explicit scan of the same.
Remove the scan method BTRFS_SCAN_PROC.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'cmds-device.c')
| -rw-r--r-- | cmds-device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmds-device.c b/cmds-device.c index b6470243..62f0b85b 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -199,13 +199,13 @@ static int cmd_rm_dev(int argc, char **argv) static const char * const cmd_scan_dev_usage[] = { "btrfs device scan [(-d|--all-devices)|<device> [<device>...]]", "Scan devices for a btrfs filesystem", + " -d|--all-devices (deprecated)", NULL }; static int cmd_scan_dev(int argc, char **argv) { int i, fd, e; - int where = BTRFS_SCAN_LBLKID; int devstart = 1; int all = 0; int ret = 0; @@ -223,7 +223,6 @@ static int cmd_scan_dev(int argc, char **argv) break; switch (c) { case 'd': - where = BTRFS_SCAN_PROC; all = 1; break; default: @@ -236,7 +235,7 @@ static int cmd_scan_dev(int argc, char **argv) if (all || argc == 1) { printf("Scanning for Btrfs filesystems\n"); - ret = scan_for_btrfs(where, BTRFS_UPDATE_KERNEL); + ret = btrfs_scan_lblkid(BTRFS_UPDATE_KERNEL); if (ret) fprintf(stderr, "ERROR: error %d while scanning\n", ret); goto out; |