| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Subject: initramfs: use kstrtobool() instead of strtobool() |
| Date: Sat, 14 Jan 2023 18:21:38 +0100 |
| |
| strtobool() is the same as kstrtobool(). However, the latter is more used |
| within the kernel. |
| |
| In order to remove strtobool() and slightly simplify kstrtox.h, switch to |
| the other function name. |
| |
| While at it, include the corresponding header file (<linux/kstrtox.h>) |
| |
| Link: https://lkml.kernel.org/r/2597e80cb7059ec6ad63a01b77d7c944dcc99195.1673716768.git.christophe.jaillet@wanadoo.fr |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Cc: Christian Brauner <brauner@kernel.org> |
| Cc: David Disseldorp <ddiss@suse.de> |
| Cc: "Eric W. Biederman" <ebiederm@xmission.com> |
| Cc: Martin Wilck <mwilck@suse.com> |
| Cc: wuchi <wuchi.zero@gmail.com> |
| Cc: XU pengfei <xupengfei@nfschina.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| |
| --- a/init/initramfs.c~initramfs-use-kstrtobool-instead-of-strtobool |
| +++ a/init/initramfs.c |
| @@ -11,6 +11,7 @@ |
| #include <linux/syscalls.h> |
| #include <linux/utime.h> |
| #include <linux/file.h> |
| +#include <linux/kstrtox.h> |
| #include <linux/memblock.h> |
| #include <linux/mm.h> |
| #include <linux/namei.h> |
| @@ -571,8 +572,7 @@ __setup("keepinitrd", keepinitrd_setup); |
| static bool __initdata initramfs_async = true; |
| static int __init initramfs_async_setup(char *str) |
| { |
| - strtobool(str, &initramfs_async); |
| - return 1; |
| + return kstrtobool(str, &initramfs_async) == 0; |
| } |
| __setup("initramfs_async=", initramfs_async_setup); |
| |
| _ |
