redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Guenter Roeck 2015-07-24 09:37:14 -07:00 committed by Greg Kroah-Hartman
parent 59cc3399ef
commit 4ad2adc98f
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
View File

@ -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);
void cfs_ip_addr_free(struct list_head *list);
#define strtoul(str, endp, base) simple_strtoul(str, endp, base)
#endif

2
drivers/staging/lustre/lustre/include/obd.h
View File

@ -1472,7 +1472,7 @@ static inline bool filename_is_volatile(const char *name, int namelen, int *idx)
}
/* we have an idx, read it */
start = name + LUSTRE_VOLATILE_HDR_LEN + 1;
*idx = strtoul(start, &end, 0);
*idx = simple_strtoul(start, &end, 0);
/* error cases:
* no digit, no trailing :, negative value
*/

2
drivers/staging/lustre/lustre/libcfs/libcfs_string.c
View File

@ -231,7 +231,7 @@ cfs_str2num_check(char *str, int nob, unsigned *num,
char *endp;
str = cfs_trimwhite(str);
*num = strtoul(str, &endp, 0);
*num = simple_strtoul(str, &endp, 0);
if (endp == str)
return 0;