summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFigo.zhang <figo1802@gmail.com>2009-09-21 17:01:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 07:17:30 -0700
commitbf88c8c83e4425d17e29daa5354ffb1f8ba7b225 (patch)
treefc87d3c8c94ec6451cbc9821b5d999397eaf0808
parent945a11136ebdfa7fcce319ee6215958e84cb85f6 (diff)
downloadlinux-3.10-bf88c8c83e4425d17e29daa5354ffb1f8ba7b225.tar.gz
linux-3.10-bf88c8c83e4425d17e29daa5354ffb1f8ba7b225.tar.bz2
linux-3.10-bf88c8c83e4425d17e29daa5354ffb1f8ba7b225.zip
vmalloc.c: fix double error checking
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>
-rw-r--r--mm/vmalloc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 204b8243d8a..759deae4539 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -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;
}