--- ldiskfs/mballoc.c 2017-08-01 05:41:12.711164350 -0700
+++ /usr/src/lustre/2.10.0/ldiskfs/mballoc.c 2017-08-01 05:44:25.782155391 -0700
@@ -2357,20 +2357,16 @@
num = 0;
cur = str;
end = str + cnt;
- while (cur < end) {
- int rc;
- while ((cur < end) && (*cur == ' '))
- cur++;
- rc = kstrtol(cur, 0, &value);
- if (rc != 0)
- return -EINVAL;
- if (value == 0)
- break;
- if (value <= prev)
- return -EINVAL;
- prev = value;
- num++;
- }
+ while ((cur < end) && (*cur == ' ')) cur++;
+ value = simple_strtol(cur, &cur, 0);
+ if (value == 0)
+ break;
+ if (value <= prev)
+ return -EINVAL;
+ prev = value;
+ num++;
+ }
+
new_table = kmalloc(num * sizeof(*new_table), GFP_KERNEL);
if (new_table == NULL)
John L. Hammond (john.hammond@intel.com) merged in patch https://review.whamcloud.com/29733/
Subject:
LU-9814ldiskfs: restore simple_strtol in preallocProject: fs/lustre-release
Branch: b2_10
Current Patch Set:
Commit: 3e8f17ccfe0a2358b93dbda9bba05c8dfd95aa61