fold struct fs_parameter_enum into struct constant_table (5eede625) · Commits · 戴 / test

fs/afs/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 },

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 },
		{}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 },
		{}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 },