Commit c033a93c authored Mar 22, 2011 by Petr Holasek Committed by Linus Torvalds Mar 22, 2011

hugetlbfs: correct handling of negative input to /proc/sys/vm/nr_hugepages



When the user inserts a negative value into /proc/sys/vm/nr_hugepages it
will cause the kernel to allocate as many hugepages as possible and to
then update /proc/meminfo to reflect this.

This changes the behavior so that the negative input will result in
nr_hugepages value being unchanged.

Signed-off-by: Petr Holasek <pholasek@redhat.com>
Signed-off-by: Anton Arapov <anton@redhat.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Eric B Munson <emunson@mgebm.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8afdcece

mm/hugetlb.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1872,7 +1872,6 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
		unsigned long tmp;
		int ret;

		if (!write)
		tmp = h->max_huge_pages;

		if (write && h->order >= MAX_ORDER)
		@@ -1938,7 +1937,6 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
		unsigned long tmp;
		int ret;

		if (!write)
		tmp = h->nr_overcommit_huge_pages;

		if (write && h->order >= MAX_ORDER)

Admin message