Skip to content

Commit 87cbab8

Browse files
committed
btrfs: drop unused parameter options from open_ctree()
Since the new mount option parser in commit ad21f15 ("btrfs: switch to the new mount API") we don't pass the options like that anymore. Reviewed-by: Anand Jain <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent ec315b4 commit 87cbab8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

fs/btrfs/disk-io.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3202,8 +3202,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount)
32023202
return 0;
32033203
}
32043204

3205-
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,
3206-
const char *options)
3205+
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices)
32073206
{
32083207
u32 sectorsize;
32093208
u32 nodesize;

fs/btrfs/disk-io.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ struct extent_buffer *btrfs_find_create_tree_block(
5252
int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info);
5353
int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,
5454
const struct btrfs_super_block *disk_sb);
55-
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,
56-
const char *options);
55+
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices);
5756
void __cold close_ctree(struct btrfs_fs_info *fs_info);
5857
int btrfs_validate_super(const struct btrfs_fs_info *fs_info,
5958
const struct btrfs_super_block *sb, int mirror_num);

fs/btrfs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ static int btrfs_fill_super(struct super_block *sb,
971971
return err;
972972
}
973973

974-
err = open_ctree(sb, fs_devices, (char *)data);
974+
err = open_ctree(sb, fs_devices);
975975
if (err) {
976976
btrfs_err(fs_info, "open_ctree failed");
977977
return err;

0 commit comments

Comments
 (0)