ext4: clean up return values in handle_mount_opt()

Clean up return values in handle_mount_opt() and rename the function to
ext4_parse_param()

Now we can use it in fs_context_operations as .parse_param.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Link: https://lore.kernel.org/r/20211027141857.33657-11-lczerner@redhat.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4e443657d88e354a33ecdf3be2592fcfd0c26249..ebde5fb672221f815c89f960c5f16fa6f21af96b 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -92,6 +92,7 @@ static int ext4_validate_options(struct fs_context *fc);
 static int ext4_check_opt_consistency(struct fs_context *fc,
                                      struct super_block *sb);
 static int ext4_apply_options(struct fs_context *fc, struct super_block *sb);
+static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param);
 
 /*
  * Lock ordering
@@ -119,6 +120,11 @@ static int ext4_apply_options(struct fs_context *fc, struct super_block *sb);
  * transaction start -> page lock(s) -> i_data_sem (rw)
  */
 
+static const struct fs_context_operations ext4_context_ops = {
+       .parse_param    = ext4_parse_param,
+};
+
+
 #if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT2)
 static struct file_system_type ext2_fs_type = {
        .owner          = THIS_MODULE,
@@ -2276,7 +2282,7 @@ EXT4_SET_CTX(mount_opt);
 EXT4_SET_CTX(mount_opt2);
 EXT4_SET_CTX(mount_flags);
 
-static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
+static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param)
 {
        struct ext4_fs_context *ctx = fc->fs_private;
        struct fs_parse_result result;
@@ -2317,30 +2323,30 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
                        ctx->s_sb_block = result.uint_32;
                        ctx->spec |= EXT4_SPEC_s_sb_block;
                }
-               return 1;
+               return 0;
        case Opt_removed:
                ext4_msg(NULL, KERN_WARNING, "Ignoring removed %s option",
                         param->key);
-               return 1;
+               return 0;
        case Opt_abort:
                ctx_set_mount_flags(ctx, EXT4_MF_FS_ABORTED);
-               return 1;
+               return 0;
        case Opt_i_version:
                ctx_set_flags(ctx, SB_I_VERSION);
-               return 1;
+               return 0;
        case Opt_lazytime:
                ctx_set_flags(ctx, SB_LAZYTIME);
-               return 1;
+               return 0;
        case Opt_nolazytime:
                ctx_clear_flags(ctx, SB_LAZYTIME);
-               return 1;
+               return 0;
        case Opt_inlinecrypt:
 #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT
                ctx_set_flags(ctx, SB_INLINECRYPT);
 #else
                ext4_msg(NULL, KERN_ERR, "inline encryption not supported");
 #endif
-               return 1;
+               return 0;
        case Opt_errors:
        case Opt_data:
        case Opt_data_err:
@@ -2492,7 +2498,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
                if (param->type == fs_value_is_flag) {
                        ctx->spec |= EXT4_SPEC_DUMMY_ENCRYPTION;
                        ctx->test_dummy_enc_arg = NULL;
-                       return 1;
+                       return 0;
                }
                if (*param->string &&
                    !(!strcmp(param->string, "v1") ||
@@ -2583,7 +2589,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
                                ctx_clear_mount_opt(ctx, m->mount_opt);
                }
        }
-       return 1;
+       return 0;
 }
 
 static int parse_options(struct fs_context *fc, char *options)
@@ -2619,7 +2625,7 @@ static int parse_options(struct fs_context *fc, char *options)
                        param.key = key;
                        param.size = v_len;
 
-                       ret = handle_mount_opt(fc, &param);
+                       ret = ext4_parse_param(fc, &param);
                        if (param.string)
                                kfree(param.string);
                        if (ret < 0)