On Tue, Feb 15, 2022 at 03:06:10PM +0800, Jeffle Xu wrote:
> It is a trivial cleanup.
>
Would it be better to modify split_fs_names() instead and use
parameter "names" insted of directly using "root_fs_names".
Vivek
> Signed-off-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx>
> ---
> init/do_mounts.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/init/do_mounts.c b/init/do_mounts.c
> index 762b534978d9..15502d4ef249 100644
> --- a/init/do_mounts.c
> +++ b/init/do_mounts.c
> @@ -339,7 +339,7 @@ __setup("rootfstype=", fs_names_setup);
> __setup("rootdelay=", root_delay_setup);
>
> /* This can return zero length strings. Caller should check */
> -static int __init split_fs_names(char *page, size_t size, char *names)
> +static int __init split_fs_names(char *page, size_t size)
> {
> int count = 1;
> char *p = page;
> @@ -403,7 +403,7 @@ void __init mount_block_root(char *name, int flags)
> scnprintf(b, BDEVNAME_SIZE, "unknown-block(%u,%u)",
> MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
> if (root_fs_names)
> - num_fs = split_fs_names(fs_names, PAGE_SIZE, root_fs_names);
> + num_fs = split_fs_names(fs_names, PAGE_SIZE);
> else
> num_fs = list_bdev_fs_names(fs_names, PAGE_SIZE);
> retry:
> @@ -546,7 +546,7 @@ static int __init mount_nodev_root(void)
> fs_names = (void *)__get_free_page(GFP_KERNEL);
> if (!fs_names)
> return -EINVAL;
> - num_fs = split_fs_names(fs_names, PAGE_SIZE, root_fs_names);
> + num_fs = split_fs_names(fs_names, PAGE_SIZE);
>
> for (i = 0, fstype = fs_names; i < num_fs;
> i++, fstype += strlen(fstype) + 1) {
> --
> 2.27.0
>
