From: Lukas Czerner <lczerner@redhat.com>
To: linux-ext4@vger.kernel.org, tytso@mit.edu
Cc: linux-fsdevel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH v3 01/13] fs_parse: allow parameter value to be empty
Date: Thu, 21 Oct 2021 13:44:56 +0200 [thread overview]
Message-ID: <20211021114508.21407-2-lczerner@redhat.com> (raw)
In-Reply-To: <20211021114508.21407-1-lczerner@redhat.com>
Allow parameter value to be empty by spcifying fs_param_can_be_empty
flag.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
---
fs/fs_parser.c | 31 +++++++++++++++++++++++--------
include/linux/fs_parser.h | 2 +-
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/fs/fs_parser.c b/fs/fs_parser.c
index 3df07c0e32b3..ed40ce5742fd 100644
--- a/fs/fs_parser.c
+++ b/fs/fs_parser.c
@@ -199,6 +199,8 @@ int fs_param_is_bool(struct p_log *log, const struct fs_parameter_spec *p,
int b;
if (param->type != fs_value_is_string)
return fs_param_bad_value(log, param);
+ if (!*param->string && (p->flags & fs_param_can_be_empty))
+ return 0;
b = lookup_constant(bool_names, param->string, -1);
if (b == -1)
return fs_param_bad_value(log, param);
@@ -211,8 +213,11 @@ int fs_param_is_u32(struct p_log *log, const struct fs_parameter_spec *p,
struct fs_parameter *param, struct fs_parse_result *result)
{
int base = (unsigned long)p->data;
- if (param->type != fs_value_is_string ||
- kstrtouint(param->string, base, &result->uint_32) < 0)
+ if (param->type != fs_value_is_string)
+ return fs_param_bad_value(log, param);
+ if (!*param->string && (p->flags & fs_param_can_be_empty))
+ return 0;
+ if (kstrtouint(param->string, base, &result->uint_32) < 0)
return fs_param_bad_value(log, param);
return 0;
}
@@ -221,8 +226,11 @@ EXPORT_SYMBOL(fs_param_is_u32);
int fs_param_is_s32(struct p_log *log, const struct fs_parameter_spec *p,
struct fs_parameter *param, struct fs_parse_result *result)
{
- if (param->type != fs_value_is_string ||
- kstrtoint(param->string, 0, &result->int_32) < 0)
+ if (param->type != fs_value_is_string)
+ return fs_param_bad_value(log, param);
+ if (!*param->string && (p->flags & fs_param_can_be_empty))
+ return 0;
+ if (kstrtoint(param->string, 0, &result->int_32) < 0)
return fs_param_bad_value(log, param);
return 0;
}
@@ -231,8 +239,11 @@ EXPORT_SYMBOL(fs_param_is_s32);
int fs_param_is_u64(struct p_log *log, const struct fs_parameter_spec *p,
struct fs_parameter *param, struct fs_parse_result *result)
{
- if (param->type != fs_value_is_string ||
- kstrtoull(param->string, 0, &result->uint_64) < 0)
+ if (param->type != fs_value_is_string)
+ return fs_param_bad_value(log, param);
+ if (!*param->string && (p->flags & fs_param_can_be_empty))
+ return 0;
+ if (kstrtoull(param->string, 0, &result->uint_64) < 0)
return fs_param_bad_value(log, param);
return 0;
}
@@ -244,6 +255,8 @@ int fs_param_is_enum(struct p_log *log, const struct fs_parameter_spec *p,
const struct constant_table *c;
if (param->type != fs_value_is_string)
return fs_param_bad_value(log, param);
+ if (!*param->string && (p->flags & fs_param_can_be_empty))
+ return 0;
c = __lookup_constant(p->data, param->string);
if (!c)
return fs_param_bad_value(log, param);
@@ -255,7 +268,8 @@ EXPORT_SYMBOL(fs_param_is_enum);
int fs_param_is_string(struct p_log *log, const struct fs_parameter_spec *p,
struct fs_parameter *param, struct fs_parse_result *result)
{
- if (param->type != fs_value_is_string || !*param->string)
+ if (param->type != fs_value_is_string ||
+ (!*param->string && !(p->flags & fs_param_can_be_empty)))
return fs_param_bad_value(log, param);
return 0;
}
@@ -275,7 +289,8 @@ int fs_param_is_fd(struct p_log *log, const struct fs_parameter_spec *p,
{
switch (param->type) {
case fs_value_is_string:
- if (kstrtouint(param->string, 0, &result->uint_32) < 0)
+ if ((!*param->string && !(p->flags & fs_param_can_be_empty)) ||
+ kstrtouint(param->string, 0, &result->uint_32) < 0)
break;
if (result->uint_32 <= INT_MAX)
return 0;
diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h
index aab0ffc6bac6..f103c91139d4 100644
--- a/include/linux/fs_parser.h
+++ b/include/linux/fs_parser.h
@@ -42,7 +42,7 @@ struct fs_parameter_spec {
u8 opt; /* Option number (returned by fs_parse()) */
unsigned short flags;
#define fs_param_neg_with_no 0x0002 /* "noxxx" is negative param */
-#define fs_param_neg_with_empty 0x0004 /* "xxx=" is negative param */
+#define fs_param_can_be_empty 0x0004 /* "xxx=" is allowed */
#define fs_param_deprecated 0x0008 /* The param is deprecated */
const void *data;
};
--
2.31.1
next prev parent reply other threads:[~2021-10-21 11:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 11:44 [PATCH v3 00/13] ext4: new mount API conversion Lukas Czerner
2021-10-21 11:44 ` Lukas Czerner [this message]
2021-10-25 11:12 ` [PATCH v3 01/13] fs_parse: allow parameter value to be empty Carlos Maiolino
2021-10-21 11:44 ` [PATCH v3 02/13] ext4: Add fs parameter specifications for mount options Lukas Czerner
2021-10-21 11:44 ` [PATCH v3 03/13] ext4: move option validation to a separate function Lukas Czerner
2021-10-21 11:44 ` [PATCH v3 04/13] ext4: Change handle_mount_opt() to use fs_parameter Lukas Czerner
2021-10-21 11:45 ` [PATCH v3 05/13] ext4: Allow sb to be NULL in ext4_msg() Lukas Czerner
2021-10-21 11:45 ` [PATCH v3 06/13] ext4: move quota configuration out of handle_mount_opt() Lukas Czerner
2021-10-21 19:57 ` kernel test robot
2021-10-21 19:57 ` kernel test robot
2021-10-21 11:45 ` [PATCH v3 07/13] ext4: check ext2/3 compatibility outside handle_mount_opt() Lukas Czerner
2021-10-21 11:45 ` [PATCH v3 08/13] ext4: get rid of super block and sbi from handle_mount_ops() Lukas Czerner
2021-10-27 1:32 ` kernel test robot
2021-10-27 1:32 ` kernel test robot
2021-10-21 11:45 ` [PATCH v3 09/13] ext4: Completely separate options parsing and sb setup Lukas Czerner
2021-10-26 11:41 ` Carlos Maiolino
2021-10-21 11:45 ` [PATCH v3 10/13] ext4: clean up return values in handle_mount_opt() Lukas Czerner
2021-10-21 11:45 ` [PATCH v3 11/13] ext4: change token2str() to use ext4_param_specs Lukas Czerner
2021-10-26 11:40 ` Carlos Maiolino
2021-10-26 12:09 ` Lukas Czerner
2021-10-27 11:52 ` Lukas Czerner
2021-10-21 11:45 ` [PATCH v3 12/13] ext4: switch to the new mount api Lukas Czerner
2022-01-13 11:29 ` Jon Hunter
2022-01-13 12:08 ` Lukas Czerner
2022-01-13 15:06 ` Jon Hunter
2022-01-13 16:10 ` Jon Hunter
2022-01-14 9:40 ` Jon Hunter
2021-10-21 11:45 ` [PATCH v3 13/13] ext4: Remove unused match_table_t tokens Lukas Czerner
2021-10-26 11:39 ` [PATCH v3 00/13] ext4: new mount API conversion Carlos Maiolino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021114508.21407-2-lczerner@redhat.com \
--to=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.