2017-03-21 12:47:10

by Marcin Ciupak

Subject: [PATCH v2] staging: lustre: replace simple_strtoul with kstrtoint

Replace simple_strtoul with kstrtoint.
simple_strtoul is marked for obsoletion as reported by checkpatch.pl

Signed-off-by: Marcin Ciupak <[email protected]>
---
v2:
-improving kstrtoint error handling
-updating commit message

drivers/staging/lustre/lustre/obdclass/obd_mount.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index 8e0d4b1d86dc..42858ee5b444 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -924,12 +924,20 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
lmd->lmd_flags |= LMD_FLG_ABORT_RECOV;
clear++;
} else if (strncmp(s1, "recovery_time_soft=", 19) == 0) {
- lmd->lmd_recovery_time_soft = max_t(int,
- simple_strtoul(s1 + 19, NULL, 10), time_min);
+ int res;
+
+ rc = kstrtoint(s1 + 19, 10, &res);
+ if (rc)
+ goto invalid;
+ lmd->lmd_recovery_time_soft = max_t(int, res, time_min);
clear++;
} else if (strncmp(s1, "recovery_time_hard=", 19) == 0) {
- lmd->lmd_recovery_time_hard = max_t(int,
- simple_strtoul(s1 + 19, NULL, 10), time_min);
+ int res;
+
+ rc = kstrtoint(s1 + 19, 10, &res);
+ if (rc)
+ goto invalid;
+ lmd->lmd_recovery_time_hard = max_t(int, res, time_min);
clear++;
} else if (strncmp(s1, "noir", 4) == 0) {
lmd->lmd_flags |= LMD_FLG_NOIR; /* test purpose only. */
--
2.11.1

2017-04-14 08:16:44

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] staging: lustre: replace simple_strtoul with kstrtoint

On Tue, Mar 21, 2017 at 01:46:09PM +0100, Marcin Ciupak wrote:
> Replace simple_strtoul with kstrtoint.
> simple_strtoul is marked for obsoletion as reported by checkpatch.pl
>
> Signed-off-by: Marcin Ciupak <[email protected]>
> ---
> v2:
> -improving kstrtoint error handling
> -updating commit message
>
> drivers/staging/lustre/lustre/obdclass/obd_mount.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> index 8e0d4b1d86dc..42858ee5b444 100644
> --- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> +++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> @@ -924,12 +924,20 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
> lmd->lmd_flags |= LMD_FLG_ABORT_RECOV;
> clear++;
> } else if (strncmp(s1, "recovery_time_soft=", 19) == 0) {
> - lmd->lmd_recovery_time_soft = max_t(int,
> - simple_strtoul(s1 + 19, NULL, 10), time_min);
> + int res;
> +
> + rc = kstrtoint(s1 + 19, 10, &res);
> + if (rc)
> + goto invalid;
> + lmd->lmd_recovery_time_soft = max_t(int, res, time_min);

Are you sure max_t is still needed here?

And have you tested this change?

thanks,

greg k-h

2017-07-27 08:57:47

by Marcin Ciupak

Subject: Re: [PATCH v2] staging: lustre: replace simple_strtoul with kstrtoint

I did test it and not everything works as expected. I
need to reconsider that change. Please drop this patch.

Thanks,
Marcin

P.S. Sorry for late (sic!) response.

On Fri, Apr 14, 2017 at 10:16:31AM +0200, Greg Kroah-Hartman wrote:
> On Tue, Mar 21, 2017 at 01:46:09PM +0100, Marcin Ciupak wrote:
> > Replace simple_strtoul with kstrtoint.
> > simple_strtoul is marked for obsoletion as reported by checkpatch.pl
> >
> > Signed-off-by: Marcin Ciupak <[email protected]>
> > ---
> > v2:
> > -improving kstrtoint error handling
> > -updating commit message
> >
> > drivers/staging/lustre/lustre/obdclass/obd_mount.c | 16 ++++++++++++----
> > 1 file changed, 12 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> > index 8e0d4b1d86dc..42858ee5b444 100644
> > --- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> > +++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
> > @@ -924,12 +924,20 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
> > lmd->lmd_flags |= LMD_FLG_ABORT_RECOV;
> > clear++;
> > } else if (strncmp(s1, "recovery_time_soft=", 19) == 0) {
> > - lmd->lmd_recovery_time_soft = max_t(int,
> > - simple_strtoul(s1 + 19, NULL, 10), time_min);
> > + int res;
> > +
> > + rc = kstrtoint(s1 + 19, 10, &res);
> > + if (rc)
> > + goto invalid;
> > + lmd->lmd_recovery_time_soft = max_t(int, res, time_min);
>
> Are you sure max_t is still needed here?
>
> And have you tested this change?
>
> thanks,
>
> greg k-h