Messages in this thread Patch in this message | | | Date | Sat, 5 Sep 2009 22:26:48 +0100 (BST) | From | Hugh Dickins <> | Subject | [PATCH 3/3] ksm: mremap use err from ksm_madvise |
| |
mremap move's use of ksm_madvise() was assuming -ENOMEM on failure, because ksm_madvise used to say -EAGAIN for that; but ksm_madvise now says -ENOMEM (letting madvise convert that to -EAGAIN), and can also say -ERESTARTSYS when signalled: so pass the error from ksm_madvise.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk> ---
mm/mremap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
--- mmotm/mm/mremap.c 2009-09-05 14:40:16.000000000 +0100 +++ linux/mm/mremap.c 2009-09-05 16:41:55.000000000 +0100 @@ -175,6 +175,7 @@ static unsigned long move_vma(struct vm_ unsigned long excess = 0; unsigned long hiwater_vm; int split = 0; + int err; /* * We'd prefer to avoid failure later on in do_munmap: @@ -190,9 +191,10 @@ static unsigned long move_vma(struct vm_ * pages recently unmapped. But leave vma->vm_flags as it was, * so KSM can come around to merge on vma and new_vma afterwards. */ - if (ksm_madvise(vma, old_addr, old_addr + old_len, - MADV_UNMERGEABLE, &vm_flags)) - return -ENOMEM; + err = ksm_madvise(vma, old_addr, old_addr + old_len, + MADV_UNMERGEABLE, &vm_flags); + if (err) + return err; new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT); new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff);
| |