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>
This commit is contained in:
parent
c125b7cf43
commit
65ed88d472
|
@ -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;
|
||||
}
|
||||
|
|
5
utils.c
5
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;
|
||||
|
||||
|
|
3
utils.h
3
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);
|
||||
|
|
Loading…
Reference in New Issue