| From e0dcd8a05be438b3d2e49ef61441ea3a463663f8 Mon Sep 17 00:00:00 2001 |
| From: Hugh Dickins <hughd@google.com> |
| Date: Sun, 5 Jun 2011 22:03:13 -0700 |
| Subject: mm: fix ENOSPC returned by handle_mm_fault() |
| |
| From: Hugh Dickins <hughd@google.com> |
| |
| commit e0dcd8a05be438b3d2e49ef61441ea3a463663f8 upstream. |
| |
| Al Viro observes that in the hugetlb case, handle_mm_fault() may return |
| a value of the kind ENOSPC when its caller is expecting a value of the |
| kind VM_FAULT_SIGBUS: fix alloc_huge_page()'s failure returns. |
| |
| Signed-off-by: Hugh Dickins <hughd@google.com> |
| Acked-by: Al Viro <viro@zeniv.linux.org.uk> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| mm/hugetlb.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/mm/hugetlb.c |
| +++ b/mm/hugetlb.c |
| @@ -1026,10 +1026,10 @@ static struct page *alloc_huge_page(stru |
| */ |
| chg = vma_needs_reservation(h, vma, addr); |
| if (chg < 0) |
| - return ERR_PTR(chg); |
| + return ERR_PTR(-VM_FAULT_OOM); |
| if (chg) |
| if (hugetlb_get_quota(inode->i_mapping, chg)) |
| - return ERR_PTR(-ENOSPC); |
| + return ERR_PTR(-VM_FAULT_SIGBUS); |
| |
| spin_lock(&hugetlb_lock); |
| page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve); |
