Merge tag 'for-5.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[platform/kernel/linux-rpi.git] / fs / jffs2 / super.c

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 0e6406c..05d7878 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -167,27 +167,21 @@ enum {
        Opt_rp_size,
 };
 
-static const struct fs_parameter_spec jffs2_param_specs[] = {
-       fsparam_enum    ("compr",       Opt_override_compr),
-       fsparam_u32     ("rp_size",     Opt_rp_size),
-       {}
-};
-
-static const struct fs_parameter_enum jffs2_param_enums[] = {
-       { Opt_override_compr,   "none", JFFS2_COMPR_MODE_NONE },
+static const struct constant_table jffs2_param_compr[] = {
+       {"none",        JFFS2_COMPR_MODE_NONE },
 #ifdef CONFIG_JFFS2_LZO
-       { Opt_override_compr,   "lzo",  JFFS2_COMPR_MODE_FORCELZO },
+       {"lzo",         JFFS2_COMPR_MODE_FORCELZO },
 #endif
 #ifdef CONFIG_JFFS2_ZLIB
-       { Opt_override_compr,   "zlib", JFFS2_COMPR_MODE_FORCEZLIB },
+       {"zlib",        JFFS2_COMPR_MODE_FORCEZLIB },
 #endif
        {}
 };
 
-const struct fs_parameter_description jffs2_fs_parameters = {
-       .name           = "jffs2",
-       .specs          = jffs2_param_specs,
-       .enums          = jffs2_param_enums,
+static const struct fs_parameter_spec jffs2_fs_parameters[] = {
+       fsparam_enum    ("compr",       Opt_override_compr, jffs2_param_compr),
+       fsparam_u32     ("rp_size",     Opt_rp_size),
+       {}
 };
 
 static int jffs2_parse_param(struct fs_context *fc, struct fs_parameter *param)
@@ -196,7 +190,7 @@ static int jffs2_parse_param(struct fs_context *fc, struct fs_parameter *param)
        struct jffs2_sb_info *c = fc->s_fs_info;
        int opt;
 
-       opt = fs_parse(fc, &jffs2_fs_parameters, param, &result);
+       opt = fs_parse(fc, jffs2_fs_parameters, param, &result);
        if (opt < 0)
                return opt;
 
@@ -339,7 +333,7 @@ static struct file_system_type jffs2_fs_type = {
        .owner =        THIS_MODULE,
        .name =         "jffs2",
        .init_fs_context = jffs2_init_fs_context,
-       .parameters =   &jffs2_fs_parameters,
+       .parameters =   jffs2_fs_parameters,
        .kill_sb =      jffs2_kill_sb,
 };
 MODULE_ALIAS_FS("jffs2");