Merge r7522 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7774 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 17:09:24 +00:00
parent 857054a28f
commit e669d8fc39
2 changed files with 3 additions and 27 deletions
+1 -5
View File
@@ -685,13 +685,9 @@ static ssize_t iscsi_acg_sess_dedicated_threads_store(struct kobject *kobj,
acg = container_of(kobj, struct scst_acg, acg_kobj);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
res = kstrtoul(buf, 0, &val);
#else
res = strict_strtoul(buf, 0, &val);
#endif
if (res != 0) {
PRINT_ERROR("strict_strtoul() for %s failed: %d ", buf, res);
PRINT_ERROR("kstrtoul() for %s failed: %d ", buf, res);
goto out;
}