summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnand Jain <anand.jain@oracle.com>2013-07-15 13:30:47 +0800
committerDavid Sterba <dsterba@suse.cz>2013-08-09 14:32:36 +0200
commit65ed88d472fcb2278b18ecc033cfc8e7e957bc9f (patch)
treec08afaa444e3de3cea9841343dba4c1d1ebf1c46
parentc125b7cf43aac815782ded0a0f36060e81c79726 (diff)
btrfs-progs: btrfs_scan_for_fsid doesn't need all the arguments
btrfs_scan_for_fsid uses only one argument run_ioctl out of 3 so remove the rest two of them Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
-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);