UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul 

simple_strtoul is obsolete

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2016-02-16 00:47:16 -05:00 committed by Greg Kroah-Hartman
parent 3e1f3db1b2
commit 4d8a00ef54
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/lustre/lustre/libcfs/tracefile.c
View File

@ -882,12 +882,15 @@ int cfs_trace_daemon_command(char *str)
memset(cfs_tracefile, 0, sizeof(cfs_tracefile));
} else if (strncmp(str, "size=", 5) == 0) {
cfs_tracefile_size = simple_strtoul(str + 5, NULL, 0);
if (cfs_tracefile_size < 10 || cfs_tracefile_size > 20480)
cfs_tracefile_size = CFS_TRACEFILE_SIZE;
else
cfs_tracefile_size <<= 20;
unsigned long tmp;
rc = kstrtoul(str + 5, 10, &tmp);
if (!rc) {
if (tmp < 10 || tmp > 20480)
cfs_tracefile_size = CFS_TRACEFILE_SIZE;
else
cfs_tracefile_size = tmp << 20;
}
} else if (strlen(str) >= sizeof(cfs_tracefile)) {
rc = -ENAMETOOLONG;
} else if (str[0] != '/') {