From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by kanga.kvack.org (Postfix) with ESMTP id 2B9DB6B006C for ; Tue, 17 Mar 2015 04:25:51 -0400 (EDT) Received: by pdbop1 with SMTP id op1so3112968pdb.2 for ; Tue, 17 Mar 2015 01:25:50 -0700 (PDT) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com. [2607:f8b0:400e:c03::233]) by mx.google.com with ESMTPS id ws4si27780714pab.224.2015.03.17.01.25.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2015 01:25:50 -0700 (PDT) Received: by pacwe9 with SMTP id we9so3191105pac.1 for ; Tue, 17 Mar 2015 01:25:50 -0700 (PDT) From: denc716@gmail.com Subject: [PATCH 2/2] clean up to just return ERR_PTR Date: Tue, 17 Mar 2015 01:25:13 -0700 Message-Id: <1426580713-21151-2-git-send-email-denc716@gmail.com> In-Reply-To: <1426580713-21151-1-git-send-email-denc716@gmail.com> References: <1426580713-21151-1-git-send-email-denc716@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org, "Kirill A. Shutemov" , David Rientjes Cc: Derek Che Signed-off-by: Derek Che Acked-by: "Kirill A. Shutemov" Acked-by: David Rientjes --- mm/mremap.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 5da81cb..afa3ab7 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -339,25 +339,25 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, struct vm_area_struct *vma = find_vma(mm, addr); if (!vma || vma->vm_start > addr) - goto Efault; + return ERR_PTR(-EFAULT); if (is_vm_hugetlb_page(vma)) - goto Einval; + return ERR_PTR(-EINVAL); /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) - goto Efault; + return ERR_PTR(-EFAULT); /* Need to be careful about a growing mapping */ if (new_len > old_len) { unsigned long pgoff; if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) - goto Efault; + return ERR_PTR(-EFAULT); pgoff = (addr - vma->vm_start) >> PAGE_SHIFT; pgoff += vma->vm_pgoff; if (pgoff + (new_len >> PAGE_SHIFT) < pgoff) - goto Einval; + return ERR_PTR(-EINVAL); } if (vma->vm_flags & VM_LOCKED) { @@ -366,29 +366,20 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, lock_limit = rlimit(RLIMIT_MEMLOCK); locked += new_len - old_len; if (locked > lock_limit && !capable(CAP_IPC_LOCK)) - goto Eagain; + return ERR_PTR(-EAGAIN); } if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT)) - goto Enomem; + return ERR_PTR(-ENOMEM); if (vma->vm_flags & VM_ACCOUNT) { unsigned long charged = (new_len - old_len) >> PAGE_SHIFT; if (security_vm_enough_memory_mm(mm, charged)) - goto Enomem; + return ERR_PTR(-ENOMEM); *p = charged; } return vma; - -Efault: /* very odd choice for most of the cases, but... */ - return ERR_PTR(-EFAULT); -Einval: - return ERR_PTR(-EINVAL); -Enomem: - return ERR_PTR(-ENOMEM); -Eagain: - return ERR_PTR(-EAGAIN); } static unsigned long mremap_to(unsigned long addr, unsigned long old_len, -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org