btrfs: drop unused parameter options from open_ctree()
BugLink: https://bugs.launchpad.net/bugs/2102118
[ Upstream commit 87cbab86366e75dec52f787e0e0b17b2aea769ca ]
Since the new mount option parser in commit ad21f15b0f ("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: 951a3f59d268 ("btrfs: fix mount failure due to remount races")
Signed-off-by: Sasha Levin <sashal@kernel.org>
[koichiroden: adjusted context due to missing commit:
2917f74102cf ("btrfs: constify pointer parameters where applicable")]
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
committed by
Stefan Bader
parent
39265cf45f
commit
e006338082
+1
-2
@@ -3193,8 +3193,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,
|
||||
char *options)
|
||||
int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices)
|
||||
{
|
||||
u32 sectorsize;
|
||||
u32 nodesize;
|
||||
|
||||
+1
-3
@@ -40,9 +40,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,
|
||||
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(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_super_block *sb, int mirror_num);
|
||||
|
||||
+1
-1
@@ -954,7 +954,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;
|
||||
|
||||
Reference in New Issue
Block a user