From 77801d34d02e04ea4d5344415015a2ce84e0b653 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Wed, 18 Sep 2013 16:27:34 +0800 Subject: Btrfs-progs: pass flag to control whether run ioctl in btrfs_scan_for_fsid() If some fatal superblocks are damaged, running ioctl will return failure, in this case, we should avoid run ioctl. Signed-off-by: Wang Shilong Signed-off-by: David Sterba Signed-off-by: Chris Mason --- disk-io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disk-io.c') diff --git a/disk-io.c b/disk-io.c index bc673c26..62815692 100644 --- a/disk-io.c +++ b/disk-io.c @@ -911,7 +911,7 @@ void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info) int btrfs_scan_fs_devices(int fd, const char *path, struct btrfs_fs_devices **fs_devices, - u64 sb_bytenr) + u64 sb_bytenr, int run_ioctl) { u64 total_devs; int ret; @@ -926,7 +926,7 @@ int btrfs_scan_fs_devices(int fd, const char *path, } if (total_devs != 1) { - ret = btrfs_scan_for_fsid(1); + ret = btrfs_scan_for_fsid(run_ioctl); if (ret) return ret; } @@ -1005,7 +1005,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, if (restore) fs_info->on_restoring = 1; - ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr); + ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr, 1); if (ret) goto out; -- cgit v1.2.3