Commit 4b07a3c5 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] mremap MAP_NORESERVE not in flags

There is no point in do_mremap clearing MAP_NORESERVE from its flags:
it has already validated that only the MREMAP_ flags can be set,
and it has no use for MAP_NORESERVE in the code that follows anyway.
parent 36372380
...@@ -229,8 +229,6 @@ static inline unsigned long move_vma(struct vm_area_struct * vma, ...@@ -229,8 +229,6 @@ static inline unsigned long move_vma(struct vm_area_struct * vma,
return -ENOMEM; return -ENOMEM;
} }
extern int sysctl_overcommit_memory; /* FIXME!! */
/* /*
* Expand (or shrink) an existing mapping, potentially moving it at the * Expand (or shrink) an existing mapping, potentially moving it at the
* same time (controlled by the MREMAP_MAYMOVE flag and available VM space) * same time (controlled by the MREMAP_MAYMOVE flag and available VM space)
...@@ -315,8 +313,6 @@ unsigned long do_mremap(unsigned long addr, ...@@ -315,8 +313,6 @@ unsigned long do_mremap(unsigned long addr,
> current->rlim[RLIMIT_AS].rlim_cur) > current->rlim[RLIMIT_AS].rlim_cur)
goto out; goto out;
if (sysctl_overcommit_memory > 1)
flags &= ~MAP_NORESERVE;
if (vma->vm_flags & VM_ACCOUNT) { if (vma->vm_flags & VM_ACCOUNT) {
charged = (new_len - old_len) >> PAGE_SHIFT; charged = (new_len - old_len) >> PAGE_SHIFT;
if (!vm_enough_memory(charged)) if (!vm_enough_memory(charged))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment