From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux@rasmusvillemoes.dk,
dhowells@redhat.com
Subject: [PATCH 10/37] parse_integer: convert fs/cachefiles/
Date: Fri, 8 May 2015 21:37:51 +0300 [thread overview]
Message-ID: <20150508183751.GH9182@p183.telecom.by> (raw)
In-Reply-To: <20150508182911.GA9044@p183.telecom.by>
Convert away from deprecated simple_strto*() interfaces.
Switch "unsigned long" to "unsigned int" where possible.
kstrto*() functions can't be used because of trailing "%" sign. :^)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
fs/cachefiles/daemon.c | 84 +++++++++++++++++++++++++++-----------------------
1 file changed, 45 insertions(+), 39 deletions(-)
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index f601def..cc1a921 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -326,14 +326,15 @@ static int cachefiles_daemon_range_error(struct cachefiles_cache *cache,
*/
static int cachefiles_daemon_frun(struct cachefiles_cache *cache, char *args)
{
- unsigned long frun;
+ unsigned int frun;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- frun = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &frun);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -350,14 +351,15 @@ static int cachefiles_daemon_frun(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_fcull(struct cachefiles_cache *cache, char *args)
{
- unsigned long fcull;
+ unsigned int fcull;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- fcull = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &fcull);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -374,14 +376,15 @@ static int cachefiles_daemon_fcull(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
{
- unsigned long fstop;
+ unsigned int fstop;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- fstop = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &fstop);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -398,14 +401,15 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_brun(struct cachefiles_cache *cache, char *args)
{
- unsigned long brun;
+ unsigned int brun;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- brun = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &brun);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -422,14 +426,15 @@ static int cachefiles_daemon_brun(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_bcull(struct cachefiles_cache *cache, char *args)
{
- unsigned long bcull;
+ unsigned int bcull;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- bcull = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &bcull);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -446,14 +451,15 @@ static int cachefiles_daemon_bcull(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
{
- unsigned long bstop;
+ unsigned int bstop;
+ int rv;
_enter(",%s", args);
- if (!*args)
- return -EINVAL;
-
- bstop = simple_strtoul(args, &args, 10);
+ rv = parse_integer(args, 10, &bstop);
+ if (rv < 0)
+ return rv;
+ args += rv;
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -601,21 +607,21 @@ inval:
*/
static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args)
{
- unsigned long mask;
+ unsigned int mask;
+ int rv;
_enter(",%s", args);
- mask = simple_strtoul(args, &args, 0);
- if (args[0] != '\0')
- goto inval;
-
+ rv = parse_integer(args, 0, &mask);
+ if (rv < 0)
+ return rv;
+ if (args[rv] != '\0') {
+ pr_err("debug command requires mask\n");
+ return -EINVAL;
+ }
cachefiles_debug = mask;
_leave(" = 0");
return 0;
-
-inval:
- pr_err("debug command requires mask\n");
- return -EINVAL;
}
/*
--
2.0.4
next prev parent reply other threads:[~2015-05-08 18:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 18:29 [PATCH 01/12] kstrto*: accept "-0" for signed conversion Alexey Dobriyan
2015-05-08 18:30 ` [PATCH 02/12] Add parse_integer() (replacement for simple_strto*()) Alexey Dobriyan
2015-05-08 20:46 ` Andrew Morton
2015-05-08 21:52 ` Rasmus Villemoes
2015-05-10 13:52 ` Alexey Dobriyan
2015-05-13 12:19 ` Alexey Dobriyan
2015-05-10 15:52 ` Noel Grandin
2015-07-09 19:28 ` Andrew Morton
2015-07-10 6:46 ` Alexey Dobriyan
2015-05-08 18:31 ` [PATCH 03/12] parse_integer: add runtime testsuite Alexey Dobriyan
2015-05-08 18:33 ` [PATCH 04/12] parse-integer: rewrite kstrto*() Alexey Dobriyan
2015-05-08 18:33 ` [PATCH 05/12] parse_integer: convert scanf() Alexey Dobriyan
2015-05-08 18:34 ` [PATCH 06/12] scanf: fix type range overflow Alexey Dobriyan
2015-05-08 18:35 ` [PATCH 07/12] parse_integer: convert lib/ Alexey Dobriyan
2015-05-08 18:35 ` [PATCH 08/12] parse_integer: convert mm/ Alexey Dobriyan
2015-05-08 18:36 ` [PATCH 09/12] parse_integer: convert fs/ Alexey Dobriyan
2015-05-08 18:37 ` Alexey Dobriyan [this message]
2015-05-08 18:39 ` [PATCH 11/12] parse_integer: convert ext2, ext3, ext4 Alexey Dobriyan
2015-05-08 18:40 ` [PATCH 12/12] parse_integer: convert fs/ocfs2/ Alexey Dobriyan
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=20150508183751.GH9182@p183.telecom.by \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/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;
as well as URLs for NNTP newsgroup(s).