diff options
author | Eric Sandeen <sandeen@redhat.com> | 2014-08-20 17:23:20 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-10 09:32:13 +0200 |
commit | 1c1ac30d93799529f06b713c223c9460482be7f9 (patch) | |
tree | 8c97973f34b18ff4a04b8b25e4165207dbce8ad7 /disk-io.c | |
parent | 4e85e481887abba8141ff43597c09b5f91d70ee4 (diff) |
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>
Diffstat (limited to 'disk-io.c')
-rw-r--r-- | disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1002,7 +1002,7 @@ int btrfs_scan_fs_devices(int fd, const char *path, } if (total_devs != 1) { - ret = btrfs_scan_for_fsid(run_ioctl); + ret = scan_for_btrfs(BTRFS_SCAN_PROC, run_ioctl); if (ret) return ret; } |