iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Add some missing error messages

Browse Source 
bch2_opt_parse() was failing to generate error messages in error path.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-06-04 14:49:02 -04:00 committed by Kent Overstreet
parent 636d4eef1e
commit 4a7a7ea1f5
1 changed files with 20 additions and 4 deletions

24
fs/bcachefs/opts.c

@ -267,20 +267,32 @@ int bch2_opt_parse(struct bch_fs *c,
switch (opt->type) {
case BCH_OPT_BOOL:
ret = kstrtou64(val, 10, res);
if (ret < 0)
if (ret < 0 || (*res != 0 && *res != 1)) {
if (err)
pr_buf(err, "%s: must be bool",
opt->attr.name);
return ret;
}
break;
case BCH_OPT_UINT:
ret = opt->flags & OPT_HUMAN_READABLE
? bch2_strtou64_h(val, res)
: kstrtou64(val, 10, res);
if (ret < 0)
if (ret < 0) {
if (err)
pr_buf(err, "%s: must be a number",
opt->attr.name);
return ret;
}
break;
case BCH_OPT_STR:
ret = match_string(opt->choices, -1, val);
if (ret < 0)
if (ret < 0) {
if (err)
pr_buf(err, "%s: invalid selection",
opt->attr.name);
return ret;
}
*res = ret;
break;
@ -289,8 +301,12 @@ int bch2_opt_parse(struct bch_fs *c,
return 0;
ret = opt->parse(c, val, res);
if (ret < 0)
if (ret < 0) {
if (err)
pr_buf(err, "%s: parse error",
opt->attr.name);
return ret;
}
}
return bch2_opt_validate(opt, *res, err);