Commit 4ad2adc9 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

staging: lustre: Replace strtoul with simple_strtoul

Defining and using strtoul in lustre code results in the following
compile warnings (arm64:allmodconfig).

include/linux/libcfs/libcfs_string.h:105:0: warning: "strtoul" redefined
	#define strtoul(str, endp, base) simple_strtoul(str, endp, base)
include/acpi/platform/aclinux.h:122:0: note:
		this is the location of the previous definition
	#define strtoul	simple_strtoul

Remove the definition and use simple_strtoul() directly. Note that we
can not replace simple_strtoul with kstrtoul since the end pointer
is used by the code.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59cc3399
...@@ -102,6 +102,4 @@ int cfs_ip_addr_parse(char *str, int len, struct list_head *list); ...@@ -102,6 +102,4 @@ int cfs_ip_addr_parse(char *str, int len, struct list_head *list);
int cfs_ip_addr_match(__u32 addr, struct list_head *list); int cfs_ip_addr_match(__u32 addr, struct list_head *list);
void cfs_ip_addr_free(struct list_head *list); void cfs_ip_addr_free(struct list_head *list);
#define strtoul(str, endp, base) simple_strtoul(str, endp, base)
#endif #endif
...@@ -1472,7 +1472,7 @@ static inline bool filename_is_volatile(const char *name, int namelen, int *idx) ...@@ -1472,7 +1472,7 @@ static inline bool filename_is_volatile(const char *name, int namelen, int *idx)
} }
/* we have an idx, read it */ /* we have an idx, read it */
start = name + LUSTRE_VOLATILE_HDR_LEN + 1; start = name + LUSTRE_VOLATILE_HDR_LEN + 1;
*idx = strtoul(start, &end, 0); *idx = simple_strtoul(start, &end, 0);
/* error cases: /* error cases:
* no digit, no trailing :, negative value * no digit, no trailing :, negative value
*/ */
......
...@@ -231,7 +231,7 @@ cfs_str2num_check(char *str, int nob, unsigned *num, ...@@ -231,7 +231,7 @@ cfs_str2num_check(char *str, int nob, unsigned *num,
char *endp; char *endp;
str = cfs_trimwhite(str); str = cfs_trimwhite(str);
*num = strtoul(str, &endp, 0); *num = simple_strtoul(str, &endp, 0);
if (endp == str) if (endp == str)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment