]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: drop unused parameter data from btrfs_fill_super()
authorDavid Sterba <dsterba@suse.com>
Wed, 9 Oct 2024 14:32:17 +0000 (16:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 19:04:13 +0000 (20:04 +0100)
[ 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 <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>
fs/btrfs/super.c

index 1a4225a1a20036f1bf7693ef59edff213fe77460..0c477443fbc5ff75131326305185e6693f51173e 100644 (file)
@@ -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) {