xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new primitive: __fs_parse()

Browse Source 
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: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2019-12-20 23:52:55 -05:00
parent 2c3f3dc315
commit 7f5d38141e
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/fs_parser.c
View File

@@ -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);
/**