lkml.org 
[lkml]   [2007]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[04/17] vmalloc: clean up page array indexing
    The page array is repeatedly indexed both in vunmap and vmalloc_area_node().
    Add a temporary variable to make it easier to read (and easier to patch
    later).

    Signed-off-by: Christoph Lameter <clameter@sgi.com>

    ---
    mm/vmalloc.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    Index: linux-2.6/mm/vmalloc.c
    ===================================================================
    --- linux-2.6.orig/mm/vmalloc.c 2007-09-18 13:22:16.000000000 -0700
    +++ linux-2.6/mm/vmalloc.c 2007-09-18 13:22:17.000000000 -0700
    @@ -383,8 +383,10 @@ static void __vunmap(const void *addr, i
    int i;

    for (i = 0; i < area->nr_pages; i++) {
    - BUG_ON(!area->pages[i]);
    - __free_page(area->pages[i]);
    + struct page *page = area->pages[i];
    +
    + BUG_ON(!page);
    + __free_page(page);
    }

    if (area->flags & VM_VPAGES)
    @@ -488,15 +490,19 @@ void *__vmalloc_area_node(struct vm_stru
    }

    for (i = 0; i < area->nr_pages; i++) {
    + struct page *page;
    +
    if (node < 0)
    - area->pages[i] = alloc_page(gfp_mask);
    + page = alloc_page(gfp_mask);
    else
    - area->pages[i] = alloc_pages_node(node, gfp_mask, 0);
    - if (unlikely(!area->pages[i])) {
    + page = alloc_pages_node(node, gfp_mask, 0);
    +
    + if (unlikely(!page)) {
    /* Successfully allocated i pages, free them in __vunmap() */
    area->nr_pages = i;
    goto fail;
    }
    + area->pages[i] = page;
    }

    if (map_vm_area(area, prot, &pages))
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-19 05:39    [W:0.134 / U:122.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site