Commit 30b6242c authored by Xin Hao's avatar Xin Hao Committed by Andrew Morton

mm/damon/sysfs: return 'err' value when call kstrtoul() failed

We had better return the 'err' value when calling kstrtoul() failed, so
the user will know why it really fails, there do little change, let it
return the 'err' value when failed.

Link: https://lkml.kernel.org/r/6329ebe0.050a0220.ec4bd.297cSMTPIN_ADDED_BROKEN@mx.google.comSuggested-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarXin Hao <xhao@linux.alibaba.com>
Reviewed-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Reviewed-by: default avatarXin Hao <xhao@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a57ae9ef
...@@ -58,7 +58,7 @@ static ssize_t min_store(struct kobject *kobj, struct kobj_attribute *attr, ...@@ -58,7 +58,7 @@ static ssize_t min_store(struct kobject *kobj, struct kobj_attribute *attr,
err = kstrtoul(buf, 0, &min); err = kstrtoul(buf, 0, &min);
if (err) if (err)
return -EINVAL; return err;
range->min = min; range->min = min;
return count; return count;
...@@ -83,7 +83,7 @@ static ssize_t max_store(struct kobject *kobj, struct kobj_attribute *attr, ...@@ -83,7 +83,7 @@ static ssize_t max_store(struct kobject *kobj, struct kobj_attribute *attr,
err = kstrtoul(buf, 0, &max); err = kstrtoul(buf, 0, &max);
if (err) if (err)
return -EINVAL; return err;
range->max = max; range->max = max;
return count; return count;
...@@ -291,9 +291,7 @@ static ssize_t interval_us_store(struct kobject *kobj, ...@@ -291,9 +291,7 @@ static ssize_t interval_us_store(struct kobject *kobj,
struct damon_sysfs_watermarks, kobj); struct damon_sysfs_watermarks, kobj);
int err = kstrtoul(buf, 0, &watermarks->interval_us); int err = kstrtoul(buf, 0, &watermarks->interval_us);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t high_show(struct kobject *kobj, static ssize_t high_show(struct kobject *kobj,
...@@ -312,9 +310,7 @@ static ssize_t high_store(struct kobject *kobj, ...@@ -312,9 +310,7 @@ static ssize_t high_store(struct kobject *kobj,
struct damon_sysfs_watermarks, kobj); struct damon_sysfs_watermarks, kobj);
int err = kstrtoul(buf, 0, &watermarks->high); int err = kstrtoul(buf, 0, &watermarks->high);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t mid_show(struct kobject *kobj, static ssize_t mid_show(struct kobject *kobj,
...@@ -333,9 +329,7 @@ static ssize_t mid_store(struct kobject *kobj, ...@@ -333,9 +329,7 @@ static ssize_t mid_store(struct kobject *kobj,
struct damon_sysfs_watermarks, kobj); struct damon_sysfs_watermarks, kobj);
int err = kstrtoul(buf, 0, &watermarks->mid); int err = kstrtoul(buf, 0, &watermarks->mid);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t low_show(struct kobject *kobj, static ssize_t low_show(struct kobject *kobj,
...@@ -354,9 +348,7 @@ static ssize_t low_store(struct kobject *kobj, ...@@ -354,9 +348,7 @@ static ssize_t low_store(struct kobject *kobj,
struct damon_sysfs_watermarks, kobj); struct damon_sysfs_watermarks, kobj);
int err = kstrtoul(buf, 0, &watermarks->low); int err = kstrtoul(buf, 0, &watermarks->low);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static void damon_sysfs_watermarks_release(struct kobject *kobj) static void damon_sysfs_watermarks_release(struct kobject *kobj)
...@@ -437,9 +429,7 @@ static ssize_t sz_permil_store(struct kobject *kobj, ...@@ -437,9 +429,7 @@ static ssize_t sz_permil_store(struct kobject *kobj,
struct damon_sysfs_weights, kobj); struct damon_sysfs_weights, kobj);
int err = kstrtouint(buf, 0, &weights->sz); int err = kstrtouint(buf, 0, &weights->sz);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t nr_accesses_permil_show(struct kobject *kobj, static ssize_t nr_accesses_permil_show(struct kobject *kobj,
...@@ -458,9 +448,7 @@ static ssize_t nr_accesses_permil_store(struct kobject *kobj, ...@@ -458,9 +448,7 @@ static ssize_t nr_accesses_permil_store(struct kobject *kobj,
struct damon_sysfs_weights, kobj); struct damon_sysfs_weights, kobj);
int err = kstrtouint(buf, 0, &weights->nr_accesses); int err = kstrtouint(buf, 0, &weights->nr_accesses);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t age_permil_show(struct kobject *kobj, static ssize_t age_permil_show(struct kobject *kobj,
...@@ -479,9 +467,7 @@ static ssize_t age_permil_store(struct kobject *kobj, ...@@ -479,9 +467,7 @@ static ssize_t age_permil_store(struct kobject *kobj,
struct damon_sysfs_weights, kobj); struct damon_sysfs_weights, kobj);
int err = kstrtouint(buf, 0, &weights->age); int err = kstrtouint(buf, 0, &weights->age);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static void damon_sysfs_weights_release(struct kobject *kobj) static void damon_sysfs_weights_release(struct kobject *kobj)
...@@ -1111,9 +1097,7 @@ static ssize_t start_store(struct kobject *kobj, struct kobj_attribute *attr, ...@@ -1111,9 +1097,7 @@ static ssize_t start_store(struct kobject *kobj, struct kobj_attribute *attr,
struct damon_sysfs_region, kobj); struct damon_sysfs_region, kobj);
int err = kstrtoul(buf, 0, &region->start); int err = kstrtoul(buf, 0, &region->start);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static ssize_t end_show(struct kobject *kobj, struct kobj_attribute *attr, static ssize_t end_show(struct kobject *kobj, struct kobj_attribute *attr,
...@@ -1132,9 +1116,7 @@ static ssize_t end_store(struct kobject *kobj, struct kobj_attribute *attr, ...@@ -1132,9 +1116,7 @@ static ssize_t end_store(struct kobject *kobj, struct kobj_attribute *attr,
struct damon_sysfs_region, kobj); struct damon_sysfs_region, kobj);
int err = kstrtoul(buf, 0, &region->end); int err = kstrtoul(buf, 0, &region->end);
if (err) return err ? err : count;
return -EINVAL;
return count;
} }
static void damon_sysfs_region_release(struct kobject *kobj) static void damon_sysfs_region_release(struct kobject *kobj)
...@@ -1528,7 +1510,7 @@ static ssize_t sample_us_store(struct kobject *kobj, ...@@ -1528,7 +1510,7 @@ static ssize_t sample_us_store(struct kobject *kobj,
int err = kstrtoul(buf, 0, &us); int err = kstrtoul(buf, 0, &us);
if (err) if (err)
return -EINVAL; return err;
intervals->sample_us = us; intervals->sample_us = us;
return count; return count;
...@@ -1552,7 +1534,7 @@ static ssize_t aggr_us_store(struct kobject *kobj, struct kobj_attribute *attr, ...@@ -1552,7 +1534,7 @@ static ssize_t aggr_us_store(struct kobject *kobj, struct kobj_attribute *attr,
int err = kstrtoul(buf, 0, &us); int err = kstrtoul(buf, 0, &us);
if (err) if (err)
return -EINVAL; return err;
intervals->aggr_us = us; intervals->aggr_us = us;
return count; return count;
...@@ -1576,7 +1558,7 @@ static ssize_t update_us_store(struct kobject *kobj, ...@@ -1576,7 +1558,7 @@ static ssize_t update_us_store(struct kobject *kobj,
int err = kstrtoul(buf, 0, &us); int err = kstrtoul(buf, 0, &us);
if (err) if (err)
return -EINVAL; return err;
intervals->update_us = us; intervals->update_us = us;
return count; return count;
......
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