mm/shmem: Refactor to reuse vfs_parse_monolithic_sep for option parsing
Subsystems (2)
PATCH 1/1 mm/shmem: Refactor to reuse vfs_parse_monolithic_sep for option parsing
The shmem_parse_options function is refactored to use vfs_parse_monolithic_sep with a custom separator function, shmem_next_opt. This eliminates redundant logic for parsing comma-separated options and ensures consistency with other kernel code that uses the same interface.
The vfs_parse_monolithic_sep() helper, introduced in commit e001d1447cd4 ("fs: factor out vfs_parse_monolithic_sep() helper").
Signed-off-by Guo Weikang <[email protected]>
--- mm/shmem.c | 65 +++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 38 deletions(-)
mm/shmem.c +27 -38
@@ -4646,48 +4646,37 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)return invalfc (fc,"Bad value for '%s'" , param->key); } -static int shmem_parse_options (struct fs_context *fc,void *data) +static char *shmem_next_opt (char **s) { -char *options = data; +char *sbegin = *s; +char *p; -if (options) { -int err =security_sb_eat_lsm_opts (options, &fc->security); -if (err) -return err; - } +if (sbegin ==NULL ) +return NULL ; -while (options !=NULL ) { -char *this_char = options; -for (;;) { -/* -* NUL-terminate this option: unfortunately, -* mount options form a comma-separated list, -* but mpol's nodelist may also contain commas. -*/ - options =strchr (options,',' ); -if (options ==NULL ) -break ; - options++; -if (!isdigit (*options)) { - options[-1 ] ='\0' ; -break ; - } - } -if (*this_char) { -char *value =strchr (this_char,'=' ); -size_t len =0 ; -int err; - -if (value) { - *value++ ='\0' ; - len =strlen (value); - } - err =vfs_parse_fs_string (fc, this_char, value, len); -if (err <0 ) -return err; +/* +* NUL-terminate this option: unfortunately, +* mount options form a comma-separated list, +* but mpol's nodelist may also contain commas. +*/ +for (;;) { + p =strchr (*s,',' ); +if (p ==NULL ) +break ; + *s = p +1 ; +if (!isdigit (*(p+1 ))) { + *p ='\0' ; +return sbegin; } } -return 0 ; + + *s =NULL ; +return sbegin; +} + +static int shmem_parse_monolithic (struct fs_context *fc,void *data) +{ +return vfs_parse_monolithic_sep (fc, data, shmem_next_opt); }/*
@@ -5037,7 +5026,7 @@ static const struct fs_context_operations shmem_fs_context_ops = { .free = shmem_free_fc, .get_tree = shmem_get_tree, #ifdef CONFIG_TMPFS - .parse_monolithic = shmem_parse_options, + .parse_monolithic = shmem_parse_monolithic, .parse_param = shmem_parse_one, .reconfigure = shmem_reconfigure, #endif
Signature · 1 line
2.25.1