Commit 06f9d8c2 authored Mar 05, 2010 by KOSAKI Motohiro Committed by Linus Torvalds Mar 06, 2010

mm: mlock_vma_pages_range() only return success or failure

Currently, mlock_vma_pages_range() only return len or 0.  then current
error handling of mmap_region() is meaningless complex.

This patch makes simplify and makes consist with brk() code.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamewzawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c58267c3

mm/mmap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1265,8 +1265,8 @@ out:
		mm->total_vm += len >> PAGE_SHIFT;
		vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
		if (vm_flags & VM_LOCKED) {
		long nr_pages = mlock_vma_pages_range(vma, addr, addr + len);
		mm->locked_vm += (len >> PAGE_SHIFT) - nr_pages;
		if (!mlock_vma_pages_range(vma, addr, addr + len))
		mm->locked_vm += (len >> PAGE_SHIFT);
		} else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
		make_pages_present(addr, addr + len);
		return addr;

Admin message