kernel: replace strict_strto*() with kstrto*()
Subsystems (2)
PATCH 1/1 kernel: replace strict_strto*() with kstrto*()
The usage of strict_strto*() is not preferred, because strict_strto*() is obsolete. Thus, kstrto*() should be used.
--- kernel/gcov/fs.c | 2 +- kernel/ksysfs.c | 2 +- kernel/params.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-)
kernel/gcov/fs.c +1 -1
@@ -74,7 +74,7 @@ static int __init gcov_persist_setup(char *str) {unsigned long val; -if (strict_strtoul (str,0 , &val)) { +if (kstrtoul (str,0 , &val)) {pr_warning ("invalid gcov_persist parameter '%s'\n" , str);return 0 ; }
kernel/ksysfs.c +1 -1
@@ -113,7 +113,7 @@ static ssize_t kexec_crash_size_store(struct kobject *kobj,unsigned long cnt;int ret; -if (strict_strtoul (buf,0 , &cnt)) +if (kstrtoul (buf,0 , &cnt))return -EINVAL ; ret =crash_shrink_memory (cnt);
kernel/params.c +7 -7
@@ -252,13 +252,13 @@ int parse_args(const char *doing, EXPORT_SYMBOL(param_ops_##name) -STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (short, short,"%hi" , long, strict_strtol); -STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (int, int,"%i" , long, strict_strtol); -STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (long, long,"%li" , long, strict_strtol); -STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, strict_strtoul); +STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, kstrtoul); +STANDARD_PARAM_DEF (short, short,"%hi" , long, kstrtol); +STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, kstrtoul); +STANDARD_PARAM_DEF (int, int,"%i" , long, kstrtol); +STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, kstrtoul); +STANDARD_PARAM_DEF (long, long,"%li" , long, kstrtol); +STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, kstrtoul);int param_set_charp (const char *val,const struct kernel_param *kp) {
Signature · 1 line
1.7.10.4
[+cc Jean]
Quoted 53 lines · Jingoo Han
The usage of strict_strto*() is not preferred, because strict_strto*() is obsolete. Thus, kstrto*() should be used.
Signed-off-by Jingoo Han <[email protected]>--- kernel/gcov/fs.c | 2 +- kernel/ksysfs.c | 2 +- kernel/params.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-)kernel/gcov/fs.c +1
-1@@ -74,7 +74,7 @@ static int __init gcov_persist_setup(char *str) {unsigned long val; -if (strict_strtoul (str,0 , &val)) { +if (kstrtoul (str,0 , &val)) {pr_warning ("invalid gcov_persist parameter '%s'\n" , str);return 0 ; }kernel/ksysfs.c +1
-1@@ -113,7 +113,7 @@ static ssize_t kexec_crash_size_store(struct kobject *kobj,unsigned long cnt;int ret; -if (strict_strtoul (buf,0 , &cnt)) +if (kstrtoul (buf,0 , &cnt))return -EINVAL ; ret =crash_shrink_memory (cnt);kernel/params.c +1
-7@@ -252,13 +252,13 @@ int parse_args(const char *doing, EXPORT_SYMBOL(param_ops_##name) -STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (short, short,"%hi" , long, strict_strtol); -STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (int, int,"%i" , long, strict_strtol); -STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, strict_strtoul); -STANDARD_PARAM_DEF (long, long,"%li" , long, strict_strtol); -STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, strict_strtoul); +STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, kstrtoul);
kernel/params.c int parse_args(const char *doing,
Quoted 10 lines
kernel/params.c +6
-1+STANDARD_PARAM_DEF (short, short,"%hi" , long, kstrtol); +STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, kstrtoul); +STANDARD_PARAM_DEF (int, int,"%i" , long, kstrtol); +STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, kstrtoul); +STANDARD_PARAM_DEF (long, long,"%li" , long, kstrtol); +STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, kstrtoul);int param_set_charp (const char *val,const struct kernel_param *kp) { --
Hi Jingoo,
There's some indication that this change might have broken handling of signed types. See
https://lists.ozlabs.org/pipermail/linuxppc-dev/2013-September/111758.html
and https://bugzilla.kernel.org/show_bug.cgi?id=61811.
Actually, your patch above looks like it handles byte, short, and long the same way as in Jean's fix (using kstrtol, not kstrtoul). So maybe an earlier, buggy, version got merged as 6072ddc852?
Can you check it out?
Bjorn
Andrew,
Quoted 4 lines · Bjorn Helgaas
There's some indication that this change might have broken handling of signed types. See
https://lists.ozlabs.org/pipermail/linuxppc-dev/2013-September/111758.html
and https://bugzilla.kernel.org/show_bug.cgi?id=61811.
It seems this is hurting more users than I would have expected, and people are spending significant amounts of time to figure out what the root cause to their problem is. May I suggest that my fix should find its way to Linus' tree rather sooner than later?
Thanks,
Signature · 1 line
Jean Delvare
Quoted 8 lines · On Fri, 27 Sep 2013 19:53:53 +0200 Jean Delvare <[email protected]> wrote:
Andrew,
Quoted 4 lines · Bjorn Helgaas
There's some indication that this change might have broken handling of signed types. See
https://lists.ozlabs.org/pipermail/linuxppc-dev/2013-September/111758.html
and https://bugzilla.kernel.org/show_bug.cgi?id=61811.
Quoted 5 lines
It seems this is hurting more users than I would have expected, and people are spending significant amounts of time to figure out what the root cause to their problem is. May I suggest that my fix should find its way to Linus' tree rather sooner than later?
Done. I had to send that one by hand as I'm not at my desk...
Quoted 10 lines · Andrew Morton
Quoted 8 lines · On Fri, 27 Sep 2013 19:53:53 +0200 Jean Delvare <[email protected]> wrote:
Andrew,
Quoted 4 lines · Bjorn Helgaas
There's some indication that this change might have broken handling of signed types. See
https://lists.ozlabs.org/pipermail/linuxppc-dev/2013-September/111758.html
and https://bugzilla.kernel.org/show_bug.cgi?id=61811.
Quoted 7 lines
Quoted 5 lines
It seems this is hurting more users than I would have expected, and people are spending significant amounts of time to figure out what the root cause to their problem is. May I suggest that my fix should find its way to Linus' tree rather sooner than later?
Done. I had to send that one by hand as I'm not at my desk...
I just did a successful test of the patch from the mailing list. So it at least solved the problem in my case.