From: David Sterba Date: Wed, 9 Oct 2024 14:32:17 +0000 (+0200) Subject: btrfs: drop unused parameter data from btrfs_fill_super() X-Git-Tag: v6.12.5~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b633b3c3e370abc803bfadd730abbbaf93626437;p=thirdparty%2Fkernel%2Fstable.git btrfs: drop unused parameter data from btrfs_fill_super() [ Upstream commit 01c5db782e3ad1aea1d06a1765c710328c145f10 ] The only caller passes NULL, we can drop the parameter. This is since the new mount option parser done in 3bb17a25bcb09a ("btrfs: add get_tree callback for new mount API"). Reviewed-by: Anand Jain Signed-off-by: David Sterba Stable-dep-of: 951a3f59d268 ("btrfs: fix mount failure due to remount races") Signed-off-by: Sasha Levin --- diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 1a4225a1a2003..0c477443fbc5f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -946,8 +946,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec } static int btrfs_fill_super(struct super_block *sb, - struct btrfs_fs_devices *fs_devices, - void *data) + struct btrfs_fs_devices *fs_devices) { struct inode *inode; struct btrfs_fs_info *fs_info = btrfs_sb(sb); @@ -1893,7 +1892,7 @@ static int btrfs_get_tree_super(struct fs_context *fc) snprintf(sb->s_id, sizeof(sb->s_id), "%pg", bdev); shrinker_debugfs_rename(sb->s_shrink, "sb-btrfs:%s", sb->s_id); btrfs_sb(sb)->bdev_holder = &btrfs_fs_type; - ret = btrfs_fill_super(sb, fs_devices, NULL); + ret = btrfs_fill_super(sb, fs_devices); } if (ret) {