Merge branch 'merge.nfs-fs_parse.1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 72c07a3..608233d 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -41,24 +41,19 @@ enum proc_param {
        Opt_hidepid,
 };
 
-static const struct fs_parameter_spec proc_param_specs[] = {
+static const struct fs_parameter_spec proc_fs_parameters[] = {
        fsparam_u32("gid",      Opt_gid),
        fsparam_u32("hidepid",  Opt_hidepid),
        {}
 };
 
-static const struct fs_parameter_description proc_fs_parameters = {
-       .name           = "proc",
-       .specs          = proc_param_specs,
-};
-
 static int proc_parse_param(struct fs_context *fc, struct fs_parameter *param)
 {
        struct proc_fs_context *ctx = fc->fs_private;
        struct fs_parse_result result;
        int opt;
 
-       opt = fs_parse(fc, &proc_fs_parameters, param, &result);
+       opt = fs_parse(fc, proc_fs_parameters, param, &result);
        if (opt < 0)
                return opt;
 
@@ -71,7 +66,7 @@ static int proc_parse_param(struct fs_context *fc, struct fs_parameter *param)
                ctx->hidepid = result.uint_32;
                if (ctx->hidepid < HIDEPID_OFF ||
                    ctx->hidepid > HIDEPID_INVISIBLE)
-                       return invalf(fc, "proc: hidepid value must be between 0 and 2.\n");
+                       return invalfc(fc, "hidepid value must be between 0 and 2.\n");
                break;
 
        default:
@@ -207,7 +202,7 @@ static void proc_kill_sb(struct super_block *sb)
 static struct file_system_type proc_fs_type = {
        .name                   = "proc",
        .init_fs_context        = proc_init_fs_context,
-       .parameters             = &proc_fs_parameters,
+       .parameters             = proc_fs_parameters,
        .kill_sb                = proc_kill_sb,
        .fs_flags               = FS_USERNS_MOUNT | FS_DISALLOW_NOTIFY_PERM,
 };