lkml.org 
[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [39/99] mm: fix ENOSPC returned by handle_mm_fault()
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    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>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    mm/hugetlb.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.35.y/mm/hugetlb.c
    ===================================================================
    --- linux-2.6.35.y.orig/mm/hugetlb.c
    +++ linux-2.6.35.y/mm/hugetlb.c
    @@ -1030,10 +1030,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);

    \
     
     \ /
      Last update: 2011-07-28 00:07    [W:0.020 / U:0.724 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site