Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[mirror_ubuntu-artful-kernel.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b2e70073a10dc3cf3e1bb37771e33ffb8263a8bb..13e55d13045d03d84d910594b8bf033a1f323adf 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -134,8 +134,7 @@ const int btrfs_raid_mindev_error[BTRFS_NR_RAID_TYPES] = {
 };
 
 static int init_first_rw_device(struct btrfs_trans_handle *trans,
-                               struct btrfs_fs_info *fs_info,
-                               struct btrfs_device *device);
+                               struct btrfs_fs_info *fs_info);
 static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info);
 static void __btrfs_reset_dev_stats(struct btrfs_device *dev);
 static void btrfs_dev_stat_print_on_error(struct btrfs_device *dev);
@@ -2440,7 +2439,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
 
        if (seeding_dev) {
                mutex_lock(&fs_info->chunk_mutex);
-               ret = init_first_rw_device(trans, fs_info, device);
+               ret = init_first_rw_device(trans, fs_info);
                mutex_unlock(&fs_info->chunk_mutex);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
@@ -4584,8 +4583,7 @@ static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type)
                                / sizeof(struct btrfs_stripe) + 1)
 
 static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
-                              struct btrfs_fs_info *fs_info, u64 start,
-                              u64 type)
+                              u64 start, u64 type)
 {
        struct btrfs_fs_info *info = trans->fs_info;
        struct btrfs_fs_devices *fs_devices = info->fs_devices;
@@ -5009,12 +5007,11 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 
        ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
        chunk_offset = find_next_chunk(fs_info);
-       return __btrfs_alloc_chunk(trans, fs_info, chunk_offset, type);
+       return __btrfs_alloc_chunk(trans, chunk_offset, type);
 }
 
 static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
-                                        struct btrfs_fs_info *fs_info,
-                                        struct btrfs_device *device)
+                                        struct btrfs_fs_info *fs_info)
 {
        struct btrfs_root *extent_root = fs_info->extent_root;
        u64 chunk_offset;
@@ -5024,14 +5021,13 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
 
        chunk_offset = find_next_chunk(fs_info);
        alloc_profile = btrfs_get_alloc_profile(extent_root, 0);
-       ret = __btrfs_alloc_chunk(trans, fs_info, chunk_offset, alloc_profile);
+       ret = __btrfs_alloc_chunk(trans, chunk_offset, alloc_profile);
        if (ret)
                return ret;
 
        sys_chunk_offset = find_next_chunk(fs_info);
        alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0);
-       ret = __btrfs_alloc_chunk(trans, fs_info, sys_chunk_offset,
-                                 alloc_profile);
+       ret = __btrfs_alloc_chunk(trans, sys_chunk_offset, alloc_profile);
        return ret;
 }