Skip to content

Commit 180cfca

Browse files
kdavesmb49
authored andcommitted
btrfs: drop unused parameter data from btrfs_fill_super()
BugLink: https://bugs.launchpad.net/bugs/2102118 [ Upstream commit 01c5db7 ] The only caller passes NULL, we can drop the parameter. This is since the new mount option parser done in 3bb17a2 ("btrfs: add get_tree callback for new mount API"). 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> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent e006338 commit 180cfca

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

fs/btrfs/super.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -929,8 +929,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec
929929
}
930930

931931
static int btrfs_fill_super(struct super_block *sb,
932-
struct btrfs_fs_devices *fs_devices,
933-
void *data)
932+
struct btrfs_fs_devices *fs_devices)
934933
{
935934
struct inode *inode;
936935
struct btrfs_fs_info *fs_info = btrfs_sb(sb);
@@ -1873,7 +1872,7 @@ static int btrfs_get_tree_super(struct fs_context *fc)
18731872
snprintf(sb->s_id, sizeof(sb->s_id), "%pg", bdev);
18741873
shrinker_debugfs_rename(sb->s_shrink, "sb-btrfs:%s", sb->s_id);
18751874
btrfs_sb(sb)->bdev_holder = &btrfs_fs_type;
1876-
ret = btrfs_fill_super(sb, fs_devices, NULL);
1875+
ret = btrfs_fill_super(sb, fs_devices);
18771876
}
18781877

18791878
if (ret) {

0 commit comments

Comments
 (0)