Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dbb95f7 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

mm: replace strict_strtoul() with kstrtoul() 



The use of strict_strtoul() is not preferred, because strict_strtoul() is
obsolete.  Thus, kstrtoul() should be used.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6df46865

mm/huge_memory.c

+4 −4
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static ssize_t scan_sleep_millisecs_store(struct kobject *kobj, 
	unsigned long msecs;

	int err;



	err = strict_strtoul(buf, 10, &msecs);

	err = kstrtoul(buf, 10, &msecs);

	if (err || msecs > UINT_MAX)

		return -EINVAL;
@@ -444,7 +444,7 @@ static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj, 
	unsigned long msecs;

	int err;



	err = strict_strtoul(buf, 10, &msecs);

	err = kstrtoul(buf, 10, &msecs);

	if (err || msecs > UINT_MAX)

		return -EINVAL;
@@ -470,7 +470,7 @@ static ssize_t pages_to_scan_store(struct kobject *kobj, 
	int err;

	unsigned long pages;



	err = strict_strtoul(buf, 10, &pages);

	err = kstrtoul(buf, 10, &pages);

	if (err || !pages || pages > UINT_MAX)

		return -EINVAL;
@@ -538,7 +538,7 @@ static ssize_t khugepaged_max_ptes_none_store(struct kobject *kobj, 
	int err;

	unsigned long max_ptes_none;



	err = strict_strtoul(buf, 10, &max_ptes_none);

	err = kstrtoul(buf, 10, &max_ptes_none);

	if (err || max_ptes_none > HPAGE_PMD_NR-1)

		return -EINVAL;

mm/hugetlb.c

+2 −2
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, 
	struct hstate *h;

	NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY);



	err = strict_strtoul(buf, 10, &count);

	err = kstrtoul(buf, 10, &count);

	if (err)

		goto out;
@@ -1617,7 +1617,7 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj, 
	if (h->order >= MAX_ORDER)

		return -EINVAL;



	err = strict_strtoul(buf, 10, &input);

	err = kstrtoul(buf, 10, &input);

	if (err)

		return err;

mm/kmemleak.c

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ static ssize_t kmemleak_write(struct file *file, const char __user *user_buf, 
	else if (strncmp(buf, "scan=", 5) == 0) {

		unsigned long secs;



		ret = strict_strtoul(buf + 5, 0, &secs);

		ret = kstrtoul(buf + 5, 0, &secs);

		if (ret < 0)

			goto out;

		stop_scan_thread();

mm/ksm.c

+3 −3
Original line number Diff line number Diff line
@@ -2194,7 +2194,7 @@ static ssize_t sleep_millisecs_store(struct kobject *kobj, 
	unsigned long msecs;

	int err;



	err = strict_strtoul(buf, 10, &msecs);

	err = kstrtoul(buf, 10, &msecs);

	if (err || msecs > UINT_MAX)

		return -EINVAL;
@@ -2217,7 +2217,7 @@ static ssize_t pages_to_scan_store(struct kobject *kobj, 
	int err;

	unsigned long nr_pages;



	err = strict_strtoul(buf, 10, &nr_pages);

	err = kstrtoul(buf, 10, &nr_pages);

	if (err || nr_pages > UINT_MAX)

		return -EINVAL;
@@ -2239,7 +2239,7 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr, 
	int err;

	unsigned long flags;



	err = strict_strtoul(buf, 10, &flags);

	err = kstrtoul(buf, 10, &flags);

	if (err || flags > UINT_MAX)

		return -EINVAL;

	if (flags > KSM_RUN_UNMERGE)

mm/slub.c

+4 −4
Original line number Diff line number Diff line
@@ -4420,7 +4420,7 @@ static ssize_t order_store(struct kmem_cache *s, 
	unsigned long order;

	int err;



	err = strict_strtoul(buf, 10, &order);

	err = kstrtoul(buf, 10, &order);

	if (err)

		return err;
@@ -4448,7 +4448,7 @@ static ssize_t min_partial_store(struct kmem_cache *s, const char *buf, 
	unsigned long min;

	int err;



	err = strict_strtoul(buf, 10, &min);

	err = kstrtoul(buf, 10, &min);

	if (err)

		return err;
@@ -4468,7 +4468,7 @@ static ssize_t cpu_partial_store(struct kmem_cache *s, const char *buf, 
	unsigned long objects;

	int err;



	err = strict_strtoul(buf, 10, &objects);

	err = kstrtoul(buf, 10, &objects);

	if (err)

		return err;

	if (objects && !kmem_cache_has_cpu_partial(s))
@@ -4784,7 +4784,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s, 
	unsigned long ratio;

	int err;



	err = strict_strtoul(buf, 10, &ratio);

	err = kstrtoul(buf, 10, &ratio);

	if (err)

		return err;