Skip to content

Commit e006338

Browse files
kdavesmb49
authored andcommitted
btrfs: drop unused parameter options from open_ctree()
BugLink: https://bugs.launchpad.net/bugs/2102118 [ Upstream commit 87cbab8 ] 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 <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com> Stable-dep-of: 951a3f5 ("btrfs: fix mount failure due to remount races") Signed-off-by: Sasha Levin <sashal@kernel.org> [koichiroden: adjusted context due to missing commit: 2917f74 ("btrfs: constify pointer parameters where applicable")] Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 39265cf commit e006338

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

fs/btrfs/disk-io.c

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

3196-
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,
3197-
char *options)
3196+
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices)
31983197
{
31993198
u32 sectorsize;
32003199
u32 nodesize;

fs/btrfs/disk-io.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ struct extent_buffer *btrfs_find_create_tree_block(
4040
int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info);
4141
int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,
4242
const struct btrfs_super_block *disk_sb);
43-
int __cold open_ctree(struct super_block *sb,
44-
struct btrfs_fs_devices *fs_devices,
45-
char *options);
43+
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices);
4644
void __cold close_ctree(struct btrfs_fs_info *fs_info);
4745
int btrfs_validate_super(struct btrfs_fs_info *fs_info,
4846
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
@@ -954,7 +954,7 @@ static int btrfs_fill_super(struct super_block *sb,
954954
return err;
955955
}
956956

957-
err = open_ctree(sb, fs_devices, (char *)data);
957+
err = open_ctree(sb, fs_devices);
958958
if (err) {
959959
btrfs_err(fs_info, "open_ctree failed");
960960
return err;

0 commit comments

Comments
 (0)