[PATCH 2/2,resend] sunrpc/cache.h: replace simple_strtoul

From: Eldad Zack
Date: Fri Jul 06 2012 - 15:32:40 EST


This patch replaces the usage of simple_strtoul with kstrtoint in
get_int(), since the simple_str* family doesn't account for overflow
and is deprecated.
Also, in this specific case, the long from strtol is silently converted
to an int by the caller.

As Joe Perches <joe@xxxxxxxxxxx> suggested, this patch also removes
the redundant temporary variable rv, since kstrtoint() will not write to
anint unless it's successful.

Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Eldad Zack <eldad@xxxxxxxxxxxxxxx>
---
Resent to include improvements from Joe Perches and proper changelog as
J. Bruce Fields kindly pointed out.
include/linux/sunrpc/cache.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 6def1f6..af42596 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -217,8 +217,6 @@ extern int qword_get(char **bpp, char *dest, int bufsize);
static inline int get_int(char **bpp, int *anint)
{
char buf[50];
- char *ep;
- int rv;
int len = qword_get(bpp, buf, sizeof(buf));

if (len < 0)
@@ -226,11 +224,9 @@ static inline int get_int(char **bpp, int *anint)
if (len == 0)
return -ENOENT;

- rv = simple_strtol(buf, &ep, 0);
- if (*ep)
+ if (kstrtoint(buf, 0, anint))
return -EINVAL;

- *anint = rv;
return 0;
}

--
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/