Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933995AbdCLNhP (ORCPT ); Sun, 12 Mar 2017 09:37:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45452 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755747AbdCLNhJ (ORCPT ); Sun, 12 Mar 2017 09:37:09 -0400 Date: Sun, 12 Mar 2017 14:36:47 +0100 From: Greg Kroah-Hartman To: Marcin Ciupak Cc: Oleg Drokin , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Andreas Dilger , lustre-devel@lists.lustre.org Subject: Re: [PATCH] staging: lustre: replace simple_strtoul with kstrtoint Message-ID: <20170312133647.GB27791@kroah.com> References: <20170309145300.GA2849@gentoo> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170309145300.GA2849@gentoo> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1363 Lines: 38 On Thu, Mar 09, 2017 at 03:53:00PM +0100, Marcin Ciupak wrote: > Replace simple_strtoul with kstrtoint. Why? > simple_strtoul is marked for obsoletion. > > Signed-off-by: Marcin Ciupak > --- > drivers/staging/lustre/lustre/obdclass/obd_mount.c | 20 ++++++++++++++++---- > 1 file changed, 16 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..4a604e9b3e49 100644 > --- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c > +++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c > @@ -924,12 +924,24 @@ 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) > + lmd->lmd_recovery_time_soft = time_min; > + else > + lmd->lmd_recovery_time_soft = max_t(int, res, > + time_min); Are you sure this is correct? Do you really want to use max_t()? Why is time_min used if there is an error? Can't this all be written a lot simpler to actually make it semi-sane? thanks, greg k-h