vmalloc.c: fix double error checking
authorFigo.zhang <figo1802@gmail.com>
Tue, 22 Sep 2009 00:01:47 +0000 (17:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Sep 2009 14:17:30 +0000 (07:17 -0700)
There is no need for double error checking.

Signed-off-by: Figo.zhang <figo1802@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/vmalloc.c

index 204b8243d8abb11cb9abd2f37dd8864ad0a346aa..759deae4539a531824eb2986f5deed474a8436a6 100644 (file)
@@ -168,11 +168,9 @@ static int vmap_page_range_noflush(unsigned long start, unsigned long end,
                next = pgd_addr_end(addr, end);
                err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
                if (err)
-                       break;
+                       return err;
        } while (pgd++, addr = next, addr != end);
 
-       if (unlikely(err))
-               return err;
        return nr;
 }