Commit 7f5d3814 authored by Al Viro's avatar Al Viro
Browse files

new primitive: __fs_parse() 



fs_parse() analogue taking p_log instead of fs_context.
fs_parse() turned into a wrapper, callers in ceph_common and rbd
switched to __fs_parse().

As the result, fs_parse() never gets NULL fs_context and neither
do fs_context-based logging primitives

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2c3f3dc3

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -6360,7 +6360,7 @@ static int rbd_parse_param(struct fs_parameter *param, 
	if (ret != -ENOPARAM)

		return ret;



	token = fs_parse(NULL, &rbd_parameters, param, &result);

	token = __fs_parse(&log, &rbd_parameters, param, &result);

	dout("%s fs_parse '%s' token %d\n", __func__, param->key, token);

	if (token < 0) {

		if (token == -ENOPARAM)

fs/fs_parser.c

+15 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static const struct fs_parameter_spec *fs_lookup_key( 
 * unknown parameters are okay and -EINVAL if there was a conversion issue or

 * the parameter wasn't recognised and unknowns aren't okay.

 */

int fs_parse(struct fs_context *fc,

int __fs_parse(struct p_log *log,

	     const struct fs_parameter_description *desc,

	     struct fs_parameter *param,

	     struct fs_parse_result *result)
@@ -113,8 +113,7 @@ int fs_parse(struct fs_context *fc, 
	}



	if (p->flags & fs_param_deprecated)

		warnf(fc, "%s: Deprecated parameter '%s'",

		      desc->name, param->key);

		warn_plog(log, "Deprecated parameter '%s'", param->key);



	if (result->negated)

		goto okay;
@@ -152,8 +151,8 @@ int fs_parse(struct fs_context *fc, 
	switch (p->type) {

	case fs_param_is_flag:

		if (param->type != fs_value_is_flag)

			return invalf(fc, "%s: Unexpected value for '%s'",

				      desc->name, param->key);

			return inval_plog(log, "Unexpected value for '%s'",

				      param->key);

		result->boolean = true;

		goto okay;
@@ -238,10 +237,20 @@ okay: 
	return p->opt;



bad_value:

	return invalf(fc, "%s: Bad value for '%s'", desc->name, param->key);

	return inval_plog(log, "Bad value for '%s'", param->key);

unknown_parameter:

	return -ENOPARAM;

}

EXPORT_SYMBOL(__fs_parse);



int fs_parse(struct fs_context *fc,

	     const struct fs_parameter_description *desc,

	     struct fs_parameter *param,

	     struct fs_parse_result *result)

{

	struct p_log log = {.prefix = desc->name, .log = fc->log};

	return __fs_parse(&log, desc, param, result);

}

EXPORT_SYMBOL(fs_parse);



/**

include/linux/fs_context.h

+2 −4
Original line number Diff line number Diff line
@@ -189,10 +189,8 @@ struct fc_log { 
extern __attribute__((format(printf, 4, 5)))

void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, ...);



#define __logfc(fc, l, fmt, ...) ({		\

	struct fs_context *__fc = (fc);		\

	logfc(__fc ? __fc->log : NULL, NULL,	\

		l, fmt, ## __VA_ARGS__);})

#define __logfc(fc, l, fmt, ...) logfc((fc)->log, NULL, \

					l, fmt, ## __VA_ARGS__)

#define __plog(p, l, fmt, ...) logfc((p)->log, (p)->prefix, \

					l, fmt, ## __VA_ARGS__)

/**

include/linux/fs_parser.h

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ struct fs_parse_result { 
	};

};



extern int __fs_parse(struct p_log *log,

		    const struct fs_parameter_description *desc,

		    struct fs_parameter *value,

		    struct fs_parse_result *result);

extern int fs_parse(struct fs_context *fc,

		    const struct fs_parameter_description *desc,

		    struct fs_parameter *value,

net/ceph/ceph_common.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt, 
	int token, err;

	struct p_log log = {.prefix = "libceph", .log = fc ? fc->log : NULL};



	token = fs_parse(fc, &ceph_parameters, param, &result);

	token = __fs_parse(&log, &ceph_parameters, param, &result);

	dout("%s fs_parse '%s' token %d\n", __func__, param->key, token);

	if (token < 0)

		return token;

CRA Git | Maintained and supported by SUSTech CRA and CCSE