[PATCH] vmalloc.c: fix double error checking

From: Figo.zhang
Date: Tue Jul 07 2009 - 12:13:43 EST


it is no need for double error checking.

Signed-off-by: Figo.zhang <figo1802@xxxxxxxxx>
---
mm/vmalloc.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index f8189a4..56b2469 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -159,20 +159,15 @@ static int vmap_page_range_noflush(unsigned long start, unsigned long end,
pgd_t *pgd;
unsigned long next;
unsigned long addr = start;
- int err = 0;
int nr = 0;

BUG_ON(addr >= end);
pgd = pgd_offset_k(addr);
do {
next = pgd_addr_end(addr, end);
- err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
- if (err)
- break;
+ if (vmap_pud_range(pgd, addr, next, prot, pages, &nr))
+ return -ENOMEM;
} while (pgd++, addr = next, addr != end);
-
- if (unlikely(err))
- return err;
return nr;
}



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/