fs_parse: fold fs_parameter_desc/fs_parameter_spec

[linux-2.6-microblaze.git] / fs / afs / super.c

diff --git a/fs/afs/super.c b/fs/afs/super.c
index 862c806..dda7a9a 100644 (file)
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -38,13 +38,13 @@ static int afs_statfs(struct dentry *dentry, struct kstatfs *buf);
 static int afs_show_devname(struct seq_file *m, struct dentry *root);
 static int afs_show_options(struct seq_file *m, struct dentry *root);
 static int afs_init_fs_context(struct fs_context *fc);
-static const struct fs_parameter_description afs_fs_parameters;
+static const struct fs_parameter_spec afs_fs_parameters[];
 
 struct file_system_type afs_fs_type = {
        .owner                  = THIS_MODULE,
        .name                   = "afs",
        .init_fs_context        = afs_init_fs_context,
-       .parameters             = &afs_fs_parameters,
+       .parameters             = afs_fs_parameters,
        .kill_sb                = afs_kill_super,
        .fs_flags               = FS_RENAME_DOES_D_MOVE,
 };
@@ -81,7 +81,7 @@ static const struct constant_table afs_param_flock[] = {
        {}
 };
 
-static const struct fs_parameter_spec afs_param_specs[] = {
+static const struct fs_parameter_spec afs_fs_parameters[] = {
        fsparam_flag  ("autocell",      Opt_autocell),
        fsparam_flag  ("dyn",           Opt_dyn),
        fsparam_enum  ("flock",         Opt_flock, afs_param_flock),
@@ -89,10 +89,6 @@ static const struct fs_parameter_spec afs_param_specs[] = {
        {}
 };
 
-static const struct fs_parameter_description afs_fs_parameters = {
-       .specs          = afs_param_specs,
-};
-
 /*
  * initialise the filesystem
  */
@@ -321,7 +317,7 @@ static int afs_parse_param(struct fs_context *fc, struct fs_parameter *param)
        struct afs_fs_context *ctx = fc->fs_private;
        int opt;
 
-       opt = fs_parse(fc, &afs_fs_parameters, param, &result);
+       opt = fs_parse(fc, afs_fs_parameters, param, &result);
        if (opt < 0)
                return opt;