ext4: fix race between writepages and enabling EXT4_EXTENTS_FL

[linux.git] / fs / hugetlbfs / inode.c

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index a66e425884d14e000aa2f85b85c776cae0d347c0..aff8642f0c2eecdaaceca4e41efecb5b689d3a60 100644 (file)
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -73,7 +73,7 @@ enum hugetlb_param {
        Opt_uid,
 };
 
-static const struct fs_parameter_spec hugetlb_param_specs[] = {
+static const struct fs_parameter_spec hugetlb_fs_parameters[] = {
        fsparam_u32   ("gid",           Opt_gid),
        fsparam_string("min_size",      Opt_min_size),
        fsparam_u32   ("mode",          Opt_mode),
@@ -84,11 +84,6 @@ static const struct fs_parameter_spec hugetlb_param_specs[] = {
        {}
 };
 
-static const struct fs_parameter_description hugetlb_fs_parameters = {
-       .name           = "hugetlbfs",
-       .specs          = hugetlb_param_specs,
-};
-
 #ifdef CONFIG_NUMA
 static inline void hugetlb_set_vma_policy(struct vm_area_struct *vma,
                                        struct inode *inode, pgoff_t index)
@@ -1171,7 +1166,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par
        unsigned long ps;
        int opt;
 
-       opt = fs_parse(fc, &hugetlb_fs_parameters, param, &result);
+       opt = fs_parse(fc, hugetlb_fs_parameters, param, &result);
        if (opt < 0)
                return opt;
 
@@ -1233,7 +1228,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par
        }
 
 bad_val:
-       return invalf(fc, "hugetlbfs: Bad value '%s' for mount option '%s'\n",
+       return invalfc(fc, "Bad value '%s' for mount option '%s'\n",
                      param->string, param->key);
 }
 
@@ -1358,7 +1353,7 @@ static int hugetlbfs_init_fs_context(struct fs_context *fc)
 static struct file_system_type hugetlbfs_fs_type = {
        .name                   = "hugetlbfs",
        .init_fs_context        = hugetlbfs_init_fs_context,
-       .parameters             = &hugetlb_fs_parameters,
+       .parameters             = hugetlb_fs_parameters,
        .kill_sb                = kill_litter_super,
 };