summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--disk-io.c2
-rw-r--r--utils.c5
-rw-r--r--utils.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/disk-io.c b/disk-io.c
index 9cfbea17..970f38ad 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -922,7 +922,7 @@ int btrfs_scan_fs_devices(int fd, const char *path,
}
if (total_devs != 1) {
- ret = btrfs_scan_for_fsid(*fs_devices, total_devs, 1);
+ ret = btrfs_scan_for_fsid(1);
if (ret)
return ret;
}
diff --git a/utils.c b/utils.c
index 08002e55..011a42ac 100644
--- a/utils.c
+++ b/utils.c
@@ -949,7 +949,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
/* scan other devices */
if (is_btrfs && total_devs > 1) {
- if((ret = btrfs_scan_for_fsid(fs_devices_mnt, total_devs, 1)))
+ if((ret = btrfs_scan_for_fsid(1)))
return ret;
}
@@ -1131,8 +1131,7 @@ fail:
return ret;
}
-int btrfs_scan_for_fsid(struct btrfs_fs_devices *fs_devices, u64 total_devs,
- int run_ioctls)
+int btrfs_scan_for_fsid(int run_ioctls)
{
int ret;
diff --git a/utils.h b/utils.h
index f86d5a67..fb9670d4 100644
--- a/utils.h
+++ b/utils.h
@@ -36,8 +36,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
struct btrfs_root *root, int fd, char *path,
u64 block_count, u32 io_width, u32 io_align,
u32 sectorsize);
-int btrfs_scan_for_fsid(struct btrfs_fs_devices *fs_devices, u64 total_devs,
- int run_ioctls);
+int btrfs_scan_for_fsid(int run_ioctls);
void btrfs_register_one_device(char *fname);
int btrfs_scan_one_dir(char *dirname, int run_ioctl);
int check_mounted(const char *devicename);