Commit 4d8a00ef authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman

staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul

simple_strtoul is obsolete
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e1f3db1
...@@ -882,12 +882,15 @@ int cfs_trace_daemon_command(char *str) ...@@ -882,12 +882,15 @@ int cfs_trace_daemon_command(char *str)
memset(cfs_tracefile, 0, sizeof(cfs_tracefile)); memset(cfs_tracefile, 0, sizeof(cfs_tracefile));
} else if (strncmp(str, "size=", 5) == 0) { } else if (strncmp(str, "size=", 5) == 0) {
cfs_tracefile_size = simple_strtoul(str + 5, NULL, 0); unsigned long tmp;
if (cfs_tracefile_size < 10 || cfs_tracefile_size > 20480)
rc = kstrtoul(str + 5, 10, &tmp);
if (!rc) {
if (tmp < 10 || tmp > 20480)
cfs_tracefile_size = CFS_TRACEFILE_SIZE; cfs_tracefile_size = CFS_TRACEFILE_SIZE;
else else
cfs_tracefile_size <<= 20; cfs_tracefile_size = tmp << 20;
}
} else if (strlen(str) >= sizeof(cfs_tracefile)) { } else if (strlen(str) >= sizeof(cfs_tracefile)) {
rc = -ENAMETOOLONG; rc = -ENAMETOOLONG;
} else if (str[0] != '/') { } else if (str[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