From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH 44/45] staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul
Date: Tue, 16 Feb 2016 00:47:16 -0500 [thread overview]
Message-ID: <1455601637-3847710-45-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1455601637-3847710-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
simple_strtoul is obsolete
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
drivers/staging/lustre/lustre/libcfs/tracefile.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c
index 7df8f0a..510673d 100644
--- a/drivers/staging/lustre/lustre/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c
@@ -878,12 +878,15 @@ int cfs_trace_daemon_command(char *str)
memset(cfs_tracefile, 0, sizeof(cfs_tracefile));
} else if (strncmp(str, "size=", 5) == 0) {
- cfs_tracefile_size = simple_strtoul(str + 5, NULL, 0);
- if (cfs_tracefile_size < 10 || cfs_tracefile_size > 20480)
- cfs_tracefile_size = CFS_TRACEFILE_SIZE;
- else
- cfs_tracefile_size <<= 20;
-
+ unsigned long tmp;
+
+ rc = kstrtoul(str + 5, 10, &tmp);
+ if (!rc) {
+ if (tmp < 10 || tmp > 20480)
+ cfs_tracefile_size = CFS_TRACEFILE_SIZE;
+ else
+ cfs_tracefile_size = tmp << 20;
+ }
} else if (strlen(str) >= sizeof(cfs_tracefile)) {
rc = -ENAMETOOLONG;
} else if (str[0] != '/') {
--
2.1.0
next prev parent reply other threads:[~2016-02-16 5:49 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 5:46 [PATCH 00/45] Lustre cleanups green
2016-02-16 5:46 ` [PATCH 01/45] staging/lustre/ptlrpc: Get rid of /proc references in comments green
2016-02-16 5:46 ` [PATCH 02/45] staging/lustre/obdclass: " green
2016-02-16 5:46 ` [PATCH 03/45] staging/lustre/libcfs: " green
2016-02-16 5:46 ` [PATCH 04/45] staging/lustre/llite: " green
2016-02-16 5:46 ` [PATCH 05/45] staging/lustre/lov: " green
2016-02-16 5:46 ` [PATCH 06/45] staging/lustre: Remove unused function oti_init green
2016-02-16 5:46 ` [PATCH 07/45] staging/lustre: Remove unused osc_on_mdt function green
2016-02-16 5:46 ` [PATCH 08/45] staging/lustre: Remove server code from client_obd_setup() green
2016-02-16 5:46 ` [PATCH 09/45] staging/lustre: Remove server code from class_get_type() green
2016-02-16 5:46 ` [PATCH 10/45] staging/lustre: Remove commented out lock_lock_multi_match green
2016-02-16 5:46 ` [PATCH 11/45] staging/lustre/osc: Remove commented out osc_page_protected() green
2016-02-16 5:46 ` [PATCH 12/45] staging/lustre/libcfs: Adjust NULL comparison codestyle green
2016-02-16 5:46 ` [PATCH 13/45] staging/lustre/lov: " green
2016-02-16 5:46 ` [PATCH 14/45] staging/lustre/llite: " green
2016-02-16 5:46 ` [PATCH 15/45] staging/lustre/ldlm: " green
2016-02-16 5:46 ` [PATCH 16/45] staging/lustre/lmv: " green
2016-02-16 5:46 ` [PATCH 17/45] staging/lustre/fid: " green
2016-02-16 5:46 ` [PATCH 18/45] staging/lustre/fld: " green
2016-02-16 5:46 ` [PATCH 19/45] staging/lustre/lclient: " green
2016-02-16 5:46 ` [PATCH 20/45] staging/lustre/include: " green
2016-02-16 5:46 ` [PATCH 21/45] staging/lustre/mdc: " green
2016-02-16 5:46 ` [PATCH 22/45] staging/lustre/mgc: " green
2016-02-16 5:46 ` [PATCH 23/45] staging/lustre/obdclass: " green
2016-02-16 5:46 ` [PATCH 24/45] staging/lustre/obdecho: " green
2016-02-16 5:46 ` [PATCH 25/45] staging/lustre/osc: " green
2016-02-16 5:46 ` [PATCH 26/45] staging/lustre/ptlrpc: " green
2016-02-16 5:46 ` [PATCH 27/45] staging/lustre: Remove the "write to FSF to get a copy of GPL" wording green
2016-02-16 5:47 ` [PATCH 28/45] staging/lustre/libcfs: Cleanup: parenthesis alignment adjustments green
2016-02-16 5:47 ` [PATCH 29/45] staging/lustre/libcfs: Move EXPORT_SYMBOLs under function/variable green
2016-02-16 5:47 ` [PATCH 30/45] staging/lustre/libcfs: style change to add missing spaces for operations green
2016-02-16 5:47 ` [PATCH 31/45] staging/lustre/libcfs: reformat cfs_tcd_for_each_type_lock define green
2016-02-16 5:47 ` [PATCH 32/45] staging/lustre/libcfs: Remove stray spaces after function name green
2016-02-16 5:47 ` [PATCH 33/45] staging/lustre/libcfs: Shortened too long lines green
2016-02-16 5:47 ` [PATCH 34/45] staging/lustre/libcfs: Remove unused cfs_tcd_owns_tage() function green
2016-02-16 5:47 ` [PATCH 35/45] staging/lustre/libcfs: Move private tracefile structs out of header green
2016-02-16 5:47 ` [PATCH 36/45] staging/lustre/libcfs: Update comments style to match kernel green
2016-02-16 5:47 ` [PATCH 37/45] staging/lustre/libcfs: Remove useless returns in void functions green
2016-02-16 5:47 ` [PATCH 38/45] staging/lustre/libcfs: Remove empty lines after/before braces green
2016-02-16 5:47 ` [PATCH 39/45] staging/lustre: Update cfs_cpu_notify switch statement with a comment green
2016-02-16 5:47 ` [PATCH 40/45] staging/lustre: Get rid of cfs_trace_buf_type_t typedef green
2016-02-16 5:47 ` [PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments green
2016-02-16 5:47 ` [PATCH 42/45] staging/lustre: Remove space after cast in cfs_crypto_hash_final() green
2016-02-16 5:47 ` [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> green
2016-02-16 5:55 ` Joe Perches
2016-02-16 16:12 ` Oleg Drokin
2016-02-20 22:34 ` Greg Kroah-Hartman
2016-02-16 5:47 ` green [this message]
2016-02-16 5:47 ` [PATCH 45/45] staging/lustre: Convert cfs_str2num_check to use kstrtoul green
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455601637-3847710-45-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox