Commit 87cbab86 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop unused parameter options from open_ctree() 



Since the new mount option parser in commit ad21f15b ("btrfs:
switch to the new mount API") we don't pass the options like that
anymore.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ec315b4b

fs/btrfs/disk-io.c

+1 −2
Original line number Diff line number Diff line
@@ -3202,8 +3202,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount) 
	return 0;

}



int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,

		      const char *options)

int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices)

{

	u32 sectorsize;

	u32 nodesize;

fs/btrfs/disk-io.h

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ struct extent_buffer *btrfs_find_create_tree_block( 
int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info);

int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,

			   const struct btrfs_super_block *disk_sb);

int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,

		      const char *options);

int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices);

void __cold close_ctree(struct btrfs_fs_info *fs_info);

int btrfs_validate_super(const struct btrfs_fs_info *fs_info,

			 const struct btrfs_super_block *sb, int mirror_num);

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static int btrfs_fill_super(struct super_block *sb, 
		return err;

	}



	err = open_ctree(sb, fs_devices, (char *)data);

	err = open_ctree(sb, fs_devices);

	if (err) {

		btrfs_err(fs_info, "open_ctree failed");

		return err;