hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fold struct fs_parameter_enum into struct constant_table 

no real difference now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2019-12-16 13:33:32 -05:00
parent 2710c957a8
commit 5eede62529
8 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/afs/super.c
View File

@ -73,7 +73,7 @@ enum afs_param {
Opt_source, Opt_source,
}; };
static const struct fs_parameter_enum afs_param_flock[] = { static const struct constant_table afs_param_flock[] = {
{"local", afs_flock_mode_local }, {"local", afs_flock_mode_local },
{"openafs", afs_flock_mode_openafs }, {"openafs", afs_flock_mode_openafs },
{"strict", afs_flock_mode_strict }, {"strict", afs_flock_mode_strict },

2
fs/ceph/super.c
View File

@ -163,7 +163,7 @@ enum ceph_recover_session_mode {
ceph_recover_session_clean 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 }, { "no", ceph_recover_session_no },
{ "clean", ceph_recover_session_clean }, { "clean", ceph_recover_session_clean },
{} {}

4
fs/fs_parser.c
View File

@ -82,7 +82,7 @@ int fs_parse(struct fs_context *fc,
struct fs_parse_result *result) struct fs_parse_result *result)
{ {
const struct fs_parameter_spec *p; const struct fs_parameter_spec *p;
const struct fs_parameter_enum *e; const struct constant_table *e;
int ret = -ENOPARAM, b; int ret = -ENOPARAM, b;
result->negated = false; result->negated = false;
@ -380,7 +380,7 @@ bool fs_validate_description(const struct fs_parameter_description *desc)
name, param->name, t); name, param->name, t);
good = false; good = false;
} else if (t == fs_param_is_enum) { } 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) { if (!e || !e->name) {
pr_err("VALIDATE %s: PARAM[%s] enum with no values\n", pr_err("VALIDATE %s: PARAM[%s] enum with no values\n",
name, param->name); name, param->name);

6
fs/gfs2/ops_fstype.c
View File

@ -1271,7 +1271,7 @@ enum opt_quota {
Opt_quota_on, Opt_quota_on,
}; };
static const struct fs_parameter_enum gfs2_param_quota[] = { static const struct constant_table gfs2_param_quota[] = {
{"off", Opt_quota_off }, {"off", Opt_quota_off },
{"account", Opt_quota_account }, {"account", Opt_quota_account },
{"on", Opt_quota_on }, {"on", Opt_quota_on },
@ -1289,7 +1289,7 @@ enum opt_data {
Opt_data_ordered = GFS2_DATA_ORDERED, 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 }, {"writeback", Opt_data_writeback },
{"ordered", Opt_data_ordered }, {"ordered", Opt_data_ordered },
{} {}
@ -1300,7 +1300,7 @@ enum opt_errors {
Opt_errors_panic = GFS2_ERRORS_PANIC, 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 }, {"withdraw", Opt_errors_withdraw },
{"panic", Opt_errors_panic }, {"panic", Opt_errors_panic },
{} {}

2
fs/jffs2/super.c
View File

@ -167,7 +167,7 @@ enum {
Opt_rp_size, 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 }, {"none", JFFS2_COMPR_MODE_NONE },
#ifdef CONFIG_JFFS2_LZO #ifdef CONFIG_JFFS2_LZO
{"lzo", JFFS2_COMPR_MODE_FORCELZO }, {"lzo", JFFS2_COMPR_MODE_FORCELZO },

4
fs/nfs/fs_context.c
View File

@ -90,7 +90,7 @@ enum {
Opt_local_lock_posix, 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 }, { "all", Opt_local_lock_all },
{ "flock", Opt_local_lock_flock }, { "flock", Opt_local_lock_flock },
{ "none", Opt_local_lock_none }, { "none", Opt_local_lock_none },
@ -103,7 +103,7 @@ enum {
Opt_lookupcache_positive, 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 }, { "all", Opt_lookupcache_all },
{ "none", Opt_lookupcache_none }, { "none", Opt_lookupcache_none },
{ "pos", Opt_lookupcache_positive }, { "pos", Opt_lookupcache_positive },

5
include/linux/fs_parser.h
View File

@ -56,11 +56,6 @@ struct fs_parameter_spec {
const void *data; const void *data;
}; };
struct fs_parameter_enum {
const char *name;
u8 value;
};
struct fs_parameter_description { struct fs_parameter_description {
const char name[16]; /* Name for logging purposes */ const char name[16]; /* Name for logging purposes */
const struct fs_parameter_spec *specs; /* List of param specifications */ const struct fs_parameter_spec *specs; /* List of param specifications */

2
mm/shmem.c
View File

@ -3381,7 +3381,7 @@ enum shmem_param {
Opt_uid, 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 }, {"never", SHMEM_HUGE_NEVER },
{"always", SHMEM_HUGE_ALWAYS }, {"always", SHMEM_HUGE_ALWAYS },
{"within_size", SHMEM_HUGE_WITHIN_SIZE }, {"within_size", SHMEM_HUGE_WITHIN_SIZE },