Commit cdf7b341 authored Sep 21, 2009 by Huang Shijie Committed by Linus Torvalds Sep 22, 2009

mmap: remove unnecessary code



If (flags & MAP_LOCKED) is true, it means vm_flags has already contained
the bit VM_LOCKED which is set by calc_vm_flag_bits().

So there is no need to reset it again, just remove it.

Signed-off-by: Huang Shijie <shijie8@gmail.com>
Acked-by: 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 03f6462a

mm/mmap.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -963,11 +963,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
		vm_flags = calc_vm_prot_bits(prot) \| calc_vm_flag_bits(flags) \|
		mm->def_flags \| VM_MAYREAD \| VM_MAYWRITE \| VM_MAYEXEC;

		if (flags & MAP_LOCKED) {
		if (flags & MAP_LOCKED)
		if (!can_do_mlock())
		return -EPERM;
		vm_flags \|= VM_LOCKED;
		}

		/* mlock MCL_FUTURE? */
		if (vm_flags & VM_LOCKED) {

Admin message