From 455c824bbbe7caa65a377a21694fd056a5709151 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 3 Mar 2025 11:12:19 -0600 Subject: [PATCH] UPSTREAM: f2fs: pass sbi rather than sb to parse_options() With the new mount API the sb will not be available during initial option parsing, which will happen before fill_super reads sb from disk. Now that the sb is no longer directly referenced in parse_options, switch it to use sbi. (Note that all calls to f2fs_sb_has_* originating from parse_options will need to be deferred to later before we can use the new mount API.) Change-Id: Ieb015917c42953af9b0fdfce5fc846bc9fa9b3c3 Signed-off-by: Eric Sandeen Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim (cherry picked from commit 71e9bd3d5c04c19ef80d0bb33bf7ff1a2f0eeafb) --- fs/f2fs/super.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 6eeb81f76cb0..718bb3a32a7b 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -677,9 +677,8 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str) #endif #endif -static int parse_options(struct super_block *sb, char *options, bool is_remount) +static int parse_options(struct f2fs_sb_info *sbi, char *options, bool is_remount) { - struct f2fs_sb_info *sbi = F2FS_SB(sb); substring_t args[MAX_OPT_ARGS]; #ifdef CONFIG_F2FS_FS_COMPRESSION unsigned char (*ext)[F2FS_EXTENSION_LEN]; @@ -2382,7 +2381,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) default_options(sbi, true); /* parse mount options */ - err = parse_options(sb, data, true); + err = parse_options(sbi, data, true); if (err) goto restore_opts; @@ -4561,7 +4560,7 @@ try_onemore: goto free_sb_buf; } - err = parse_options(sb, options, false); + err = parse_options(sbi, options, false); if (err) goto free_options;