diff options
| -rw-r--r-- | fs/afs/super.c | 2 | ||||
| -rw-r--r-- | fs/ceph/super.c | 2 | ||||
| -rw-r--r-- | fs/fs_parser.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 6 | ||||
| -rw-r--r-- | fs/jffs2/super.c | 2 | ||||
| -rw-r--r-- | fs/nfs/fs_context.c | 4 | ||||
| -rw-r--r-- | include/linux/fs_parser.h | 5 | ||||
| -rw-r--r-- | mm/shmem.c | 2 |
8 files changed, 11 insertions, 16 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index 42bf63b82007..8d71d10761b7 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c @@ -73,7 +73,7 @@ enum afs_param { Opt_source, }; -static const struct fs_parameter_enum afs_param_flock[] = { +static const struct constant_table afs_param_flock[] = { {"local", afs_flock_mode_local }, {"openafs", afs_flock_mode_openafs }, {"strict", afs_flock_mode_strict }, diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 0f7c8913bb20..2bad9bc1fd70 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -163,7 +163,7 @@ enum ceph_recover_session_mode { ceph_recover_session_clean }; -static const struct fs_parameter_enum ceph_param_recover[] = { +static const struct constant_table ceph_param_recover[] = { { "no", ceph_recover_session_no }, { "clean", ceph_recover_session_clean }, {} diff --git a/fs/fs_parser.c b/fs/fs_parser.c index 34275191697f..d032ac4a758d 100644 --- a/fs/fs_parser.c +++ b/fs/fs_parser.c @@ -82,7 +82,7 @@ int fs_parse(struct fs_context *fc, struct fs_parse_result *result) { const struct fs_parameter_spec *p; - const struct fs_parameter_enum *e; + const struct constant_table *e; int ret = -ENOPARAM, b; result->negated = false; @@ -380,7 +380,7 @@ bool fs_validate_description(const struct fs_parameter_description *desc) name, param->name, t); good = false; } else if (t == fs_param_is_enum) { - const struct fs_parameter_enum *e = param->data; + const struct constant_table *e = param->data; if (!e || !e->name) { pr_err("VALIDATE %s: PARAM[%s] enum with no values\n", name, param->name); diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 0df8f2df9491..16230e496fdb 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -1271,7 +1271,7 @@ enum opt_quota { Opt_quota_on, }; -static const struct fs_parameter_enum gfs2_param_quota[] = { +static const struct constant_table gfs2_param_quota[] = { {"off", Opt_quota_off }, {"account", Opt_quota_account }, {"on", Opt_quota_on }, @@ -1289,7 +1289,7 @@ enum opt_data { Opt_data_ordered = GFS2_DATA_ORDERED, }; -static const struct fs_parameter_enum gfs2_param_data[] = { +static const struct constant_table gfs2_param_data[] = { {"writeback", Opt_data_writeback }, {"ordered", Opt_data_ordered }, {} @@ -1300,7 +1300,7 @@ enum opt_errors { Opt_errors_panic = GFS2_ERRORS_PANIC, }; -static const struct fs_parameter_enum gfs2_param_errors[] = { +static const struct constant_table gfs2_param_errors[] = { {"withdraw", Opt_errors_withdraw }, {"panic", Opt_errors_panic }, {} diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index ecd1a13a35d8..1e54f736865d 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -167,7 +167,7 @@ enum { Opt_rp_size, }; -static const struct fs_parameter_enum jffs2_param_compr[] = { +static const struct constant_table jffs2_param_compr[] = { {"none", JFFS2_COMPR_MODE_NONE }, #ifdef CONFIG_JFFS2_LZO {"lzo", JFFS2_COMPR_MODE_FORCELZO }, diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c index 01c76885f54e..c0ddeecadfac 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -90,7 +90,7 @@ enum { Opt_local_lock_posix, }; -static const struct fs_parameter_enum nfs_param_enums_local_lock[] = { +static const struct constant_table nfs_param_enums_local_lock[] = { { "all", Opt_local_lock_all }, { "flock", Opt_local_lock_flock }, { "none", Opt_local_lock_none }, @@ -103,7 +103,7 @@ enum { Opt_lookupcache_positive, }; -static const struct fs_parameter_enum nfs_param_enums_lookupcache[] = { +static const struct constant_table nfs_param_enums_lookupcache[] = { { "all", Opt_lookupcache_all }, { "none", Opt_lookupcache_none }, { "pos", Opt_lookupcache_positive }, diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h index 498cba1bbf6e..5c91a0ac4446 100644 --- a/include/linux/fs_parser.h +++ b/include/linux/fs_parser.h @@ -56,11 +56,6 @@ struct fs_parameter_spec { const void *data; }; -struct fs_parameter_enum { - const char *name; - u8 value; -}; - struct fs_parameter_description { const char name[16]; /* Name for logging purposes */ const struct fs_parameter_spec *specs; /* List of param specifications */ diff --git a/mm/shmem.c b/mm/shmem.c index 1c02c6c20f45..90c7737bcce2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3381,7 +3381,7 @@ enum shmem_param { Opt_uid, }; -static const struct fs_parameter_enum shmem_param_enums_huge[] = { +static const struct constant_table shmem_param_enums_huge[] = { {"never", SHMEM_HUGE_NEVER }, {"always", SHMEM_HUGE_ALWAYS }, {"within_size", SHMEM_HUGE_WITHIN_SIZE }, |