Commit 02f960f8 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o

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: default avatarLukas Czerner <lczerner@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Link: https://lore.kernel.org/r/20211027141857.33657-11-lczerner@redhat.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 7edfd85b
...@@ -92,6 +92,7 @@ static int ext4_validate_options(struct fs_context *fc); ...@@ -92,6 +92,7 @@ static int ext4_validate_options(struct fs_context *fc);
static int ext4_check_opt_consistency(struct fs_context *fc, static int ext4_check_opt_consistency(struct fs_context *fc,
struct super_block *sb); struct super_block *sb);
static int ext4_apply_options(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 * Lock ordering
...@@ -119,6 +120,11 @@ static int ext4_apply_options(struct fs_context *fc, struct super_block *sb); ...@@ -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) * 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) #if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT2)
static struct file_system_type ext2_fs_type = { static struct file_system_type ext2_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -2276,7 +2282,7 @@ EXT4_SET_CTX(mount_opt); ...@@ -2276,7 +2282,7 @@ EXT4_SET_CTX(mount_opt);
EXT4_SET_CTX(mount_opt2); EXT4_SET_CTX(mount_opt2);
EXT4_SET_CTX(mount_flags); 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 ext4_fs_context *ctx = fc->fs_private;
struct fs_parse_result result; struct fs_parse_result result;
...@@ -2317,30 +2323,30 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param) ...@@ -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->s_sb_block = result.uint_32;
ctx->spec |= EXT4_SPEC_s_sb_block; ctx->spec |= EXT4_SPEC_s_sb_block;
} }
return 1; return 0;
case Opt_removed: case Opt_removed:
ext4_msg(NULL, KERN_WARNING, "Ignoring removed %s option", ext4_msg(NULL, KERN_WARNING, "Ignoring removed %s option",
param->key); param->key);
return 1; return 0;
case Opt_abort: case Opt_abort:
ctx_set_mount_flags(ctx, EXT4_MF_FS_ABORTED); ctx_set_mount_flags(ctx, EXT4_MF_FS_ABORTED);
return 1; return 0;
case Opt_i_version: case Opt_i_version:
ctx_set_flags(ctx, SB_I_VERSION); ctx_set_flags(ctx, SB_I_VERSION);
return 1; return 0;
case Opt_lazytime: case Opt_lazytime:
ctx_set_flags(ctx, SB_LAZYTIME); ctx_set_flags(ctx, SB_LAZYTIME);
return 1; return 0;
case Opt_nolazytime: case Opt_nolazytime:
ctx_clear_flags(ctx, SB_LAZYTIME); ctx_clear_flags(ctx, SB_LAZYTIME);
return 1; return 0;
case Opt_inlinecrypt: case Opt_inlinecrypt:
#ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT
ctx_set_flags(ctx, SB_INLINECRYPT); ctx_set_flags(ctx, SB_INLINECRYPT);
#else #else
ext4_msg(NULL, KERN_ERR, "inline encryption not supported"); ext4_msg(NULL, KERN_ERR, "inline encryption not supported");
#endif #endif
return 1; return 0;
case Opt_errors: case Opt_errors:
case Opt_data: case Opt_data:
case Opt_data_err: case Opt_data_err:
...@@ -2492,7 +2498,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param) ...@@ -2492,7 +2498,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
if (param->type == fs_value_is_flag) { if (param->type == fs_value_is_flag) {
ctx->spec |= EXT4_SPEC_DUMMY_ENCRYPTION; ctx->spec |= EXT4_SPEC_DUMMY_ENCRYPTION;
ctx->test_dummy_enc_arg = NULL; ctx->test_dummy_enc_arg = NULL;
return 1; return 0;
} }
if (*param->string && if (*param->string &&
!(!strcmp(param->string, "v1") || !(!strcmp(param->string, "v1") ||
...@@ -2583,7 +2589,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param) ...@@ -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); ctx_clear_mount_opt(ctx, m->mount_opt);
} }
} }
return 1; return 0;
} }
static int parse_options(struct fs_context *fc, char *options) static int parse_options(struct fs_context *fc, char *options)
...@@ -2619,7 +2625,7 @@ 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.key = key;
param.size = v_len; param.size = v_len;
ret = handle_mount_opt(fc, &param); ret = ext4_parse_param(fc, &param);
if (param.string) if (param.string)
kfree(param.string); kfree(param.string);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment