btrfs-progs: don't fall back to recursive /dev scan
authorEric Sandeen <sandeen@redhat.com>
Wed, 20 Aug 2014 22:23:20 +0000 (17:23 -0500)
committerDavid Sterba <dsterba@suse.cz>
Fri, 10 Oct 2014 07:32:13 +0000 (09:32 +0200)
commit1c1ac30d93799529f06b713c223c9460482be7f9
tree8c97973f34b18ff4a04b8b25e4165207dbce8ad7
parent4e85e481887abba8141ff43597c09b5f91d70ee4
btrfs-progs: don't fall back to recursive /dev scan

If we didn't find what we are looking for in /proc/partitions,
we're not going to find it by scanning every node under /dev, either.

But that's just what btrfs_scan_for_fsid() does.

Remove that fallback; at that point btrfs_scan_for_fsid() just calls
scan_for_btrfs(), so remove the wrapper & call it directly.

Side note: so, these paths always use /proc/partitions, not libblkid.
Userspace-intiated scans default to libblkid.  I presume this is
part of the design, and intentional?  Anyway, not changing it now!

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
disk-io.c
utils.c