mm-cleanup-kstrto-usage.patch removed from -mm tree
The patch titled
Subject: mm: cleanup kstrto*() usage
has been removed from the -mm tree. Its filename was
mm-cleanup-kstrto-usage.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: mm: cleanup kstrto*() usage
Range checks can folded into proper conversion function. kstrto*() exist for all arithmetic types.
Signed-off-by Alexey Dobriyan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/khugepaged.c | 18 +++++++++--------- mm/ksm.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-cleanup-kstrto-usage +9 -9
@@ -133,11 +133,11 @@ static ssize_t scan_sleep_millisecs_storstruct kobj_attribute *attr, const char *buf, size_t count) { - unsigned long msecs; + unsigned int msecs;int err; - err =kstrtoul (buf,10 , &msecs); -if (err || msecs >UINT_MAX ) + err =kstrtouint (buf,10 , &msecs); +if (err)return -EINVAL ; khugepaged_scan_sleep_millisecs = msecs;
@@ -161,11 +161,11 @@ static ssize_t alloc_sleep_millisecs_stostruct kobj_attribute *attr, const char *buf, size_t count) { - unsigned long msecs; + unsigned int msecs;int err; - err =kstrtoul (buf,10 , &msecs); -if (err || msecs >UINT_MAX ) + err =kstrtouint (buf,10 , &msecs); +if (err)return -EINVAL ; khugepaged_alloc_sleep_millisecs = msecs;
@@ -188,11 +188,11 @@ static ssize_t pages_to_scan_store(strucstruct kobj_attribute *attr, const char *buf, size_t count) { + unsigned int pages;int err; -unsigned long pages; - err =kstrtoul (buf,10 , &pages); -if (err || !pages || pages >UINT_MAX ) + err =kstrtouint (buf,10 , &pages); +if (err || !pages)return -EINVAL ; khugepaged_pages_to_scan = pages;
mm/ksm.c renamed from mm/ksm.c~mm-cleanup-kstrto-usage +9 -9
@@ -2840,11 +2840,11 @@ static ssize_t sleep_millisecs_store(strstruct kobj_attribute *attr, const char *buf, size_t count) { - unsigned long msecs; + unsigned int msecs;int err; - err =kstrtoul (buf,10 , &msecs); -if (err || msecs >UINT_MAX ) + err =kstrtouint (buf,10 , &msecs); +if (err)return -EINVAL ; ksm_thread_sleep_millisecs = msecs;
@@ -2864,11 +2864,11 @@ static ssize_t pages_to_scan_store(strucstruct kobj_attribute *attr, const char *buf, size_t count) { + unsigned int nr_pages;int err; -unsigned long nr_pages; - err =kstrtoul (buf,10 , &nr_pages); -if (err || nr_pages >UINT_MAX ) + err =kstrtouint (buf,10 , &nr_pages); +if (err)return -EINVAL ; ksm_thread_pages_to_scan = nr_pages;
@@ -2886,11 +2886,11 @@ static ssize_t run_show(struct kobject *static ssize_t run_store (struct kobject *kobj,struct kobj_attribute *attr,const char *buf,size_t count) { +unsigned int flags;int err; -unsigned long flags; - err =kstrtoul (buf,10 , &flags); -if (err || flags >UINT_MAX ) + err =kstrtouint (buf,10 , &flags); +if (err)return -EINVAL ;if (flags >KSM_RUN_UNMERGE )return -EINVAL ;
_
Patches currently in -mm which might be from [email protected] are
ramfs-support-o_tmpfile.patch proc-fix-lookup-in-proc-net-subdirectories-after-setns2.patch lib-cleanup-kstrto-usage.patch