staging: lustre: Replace strtoul with simple_strtoul
PATCH 1/1 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 <[email protected]>
--- drivers/staging/lustre/include/linux/libcfs/libcfs_string.h | 2 -- drivers/staging/lustre/lustre/include/obd.h | 2 +- drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/lustre/include/linux/libcfs/libcfs_string.h +0 -2
@@ -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
drivers/staging/lustre/lustre/include/obd.h +1 -1
@@ -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 */
drivers/staging/lustre/lustre/libcfs/libcfs_string.c +1 -1
@@ -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 ;
Signature · 1 line
2.1.0