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 /utils.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 'utils.c')
-rw-r--r-- | utils.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1186,7 +1186,8 @@ int check_mounted_where(int fd, const char *file, char *where, int size, /* scan other devices */ if (is_btrfs && total_devs > 1) { - if ((ret = scan_for_btrfs(BTRFS_SCAN_PROC, !BTRFS_UPDATE_KERNEL))) + ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL); + if (ret) return ret; } @@ -2158,9 +2159,6 @@ int scan_for_btrfs(int where, int update_kernel) int ret = 0; switch (where) { - case BTRFS_SCAN_PROC: - ret = btrfs_scan_block_devices(update_kernel); - break; case BTRFS_SCAN_LBLKID: ret = btrfs_scan_lblkid(update_kernel); break; |