lkml.org 
[lkml]   [2013]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/10] mm, hugetlb: remove err label in dequeue_huge_page_vma()
    Date
    This label is not needed now, because there is no error handling
    except returing NULL.

    Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>

    diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    index fc4988c..d87f70b 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -546,11 +546,11 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
    */
    if (!vma_has_reserves(vma) &&
    h->free_huge_pages - h->resv_huge_pages == 0)
    - goto err;
    + return NULL;

    /* If reserves cannot be used, ensure enough pages are in the pool */
    if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
    - goto err;
    + return NULL;

    retry_cpuset:
    cpuset_mems_cookie = get_mems_allowed();
    @@ -573,9 +573,6 @@ retry_cpuset:
    if (unlikely(!put_mems_allowed(cpuset_mems_cookie) && !page))
    goto retry_cpuset;
    return page;
    -
    -err:
    - return NULL;
    }

    static void update_and_free_page(struct hstate *h, struct page *page)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-07-22 12:41    [W:4.190 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site