[PATCH] bio_alloc() cleanup

de-spaghettify this function.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/bio.c b/fs/bio.c
index d6f2eb6607d2a1f396de2abcab025ddfe8d6cb47..063c597a77cfe5b4e8d314a9e4b890c664f21ab8 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -137,33 +137,29 @@ inline void bio_init(struct bio *bio)
  **/
 struct bio *bio_alloc(int gfp_mask, int nr_iovecs)
 {
-       struct bio_vec *bvl = NULL;
-       unsigned long idx;
-       struct bio *bio;
-
-       bio = mempool_alloc(bio_pool, gfp_mask);
-       if (unlikely(!bio))
-               goto out;
+       struct bio *bio = mempool_alloc(bio_pool, gfp_mask);
 
-       bio_init(bio);
+       if (likely(bio)) {
+               struct bio_vec *bvl = NULL;
 
-       if (unlikely(!nr_iovecs))
-               goto noiovec;
+               bio_init(bio);
+               if (likely(nr_iovecs)) {
+                       unsigned long idx;
 
-       bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx);
-       if (bvl) {
-               bio->bi_flags |= idx << BIO_POOL_OFFSET;
-               bio->bi_max_vecs = bvec_array[idx].nr_vecs;
-noiovec:
+                       bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx);
+                       if (unlikely(!bvl)) {
+                               mempool_free(bio, bio_pool);
+                               bio = NULL;
+                               goto out;
+                       }
+                       bio->bi_flags |= idx << BIO_POOL_OFFSET;
+                       bio->bi_max_vecs = bvec_array[idx].nr_vecs;
+               }
                bio->bi_io_vec = bvl;
                bio->bi_destructor = bio_destructor;
-out:
-               return bio;
        }
-
-       mempool_free(bio, bio_pool);
-       bio = NULL;
-       goto out;
+out:
+       return bio;
 }
 
 /**