From: Eric Sandeen Date: Mon, 3 Mar 2025 17:12:16 +0000 (-0600) Subject: f2fs: Pass sbi rather than sb to f2fs_set_test_dummy_encryption X-Git-Tag: v6.15-rc1~151^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edcb2197e761db482d485bc0e0f5fd42cc1bc3d;p=thirdparty%2Fkernel%2Flinux.git f2fs: Pass sbi rather than sb to f2fs_set_test_dummy_encryption This removes another sb instance from parse_options() Signed-off-by: Eric Sandeen Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 500244eb94b0f..4ffa95dd41dfc 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -486,12 +486,11 @@ static int f2fs_check_quota_options(struct f2fs_sb_info *sbi) } #endif -static int f2fs_set_test_dummy_encryption(struct super_block *sb, +static int f2fs_set_test_dummy_encryption(struct f2fs_sb_info *sbi, const char *opt, const substring_t *arg, bool is_remount) { - struct f2fs_sb_info *sbi = F2FS_SB(sb); struct fs_parameter param = { .type = fs_value_is_string, .string = arg->from ? arg->from : "", @@ -1032,7 +1031,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) kfree(name); break; case Opt_test_dummy_encryption: - ret = f2fs_set_test_dummy_encryption(sb, p, &args[0], + ret = f2fs_set_test_dummy_encryption(sbi, p, &args[0], is_remount); if (ret) return ret;