diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-04 22:28:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:14 -0800 |
| commit | bf53d6f8fa467397a16de2a2500312ae26528d34 (patch) | |
| tree | 5fe5fb6e7e4835d358dcc67e7b38f1aa00b9e525 /mm/vmalloc.c | |
| parent | 9e2779fa281cfda13ac060753d674bbcaa23367e (diff) | |
| download | linux-stable-bf53d6f8fa467397a16de2a2500312ae26528d34.tar.gz linux-stable-bf53d6f8fa467397a16de2a2500312ae26528d34.tar.bz2 linux-stable-bf53d6f8fa467397a16de2a2500312ae26528d34.zip | |
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>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 21abac2c3941..83625b6fcc36 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -384,8 +384,10 @@ static void __vunmap(const void *addr, int deallocate_pages) 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) @@ -489,15 +491,19 @@ void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, } 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)) |