X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmd%2Fdm-io.c;h=ac5f74766fa287af9a373312d70886ac17466861;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=9f3fb61fdf4f0eb0f5f1716b6ff3ee920bec1687;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 9f3fb61fd..ac5f74766 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -149,22 +149,6 @@ static inline unsigned bvec_index(unsigned nr)
 	return 0;
 }
 
-static inline void bs_bio_init(struct bio *bio)
-{
-	bio->bi_next = NULL;
-	bio->bi_flags = 1 << BIO_UPTODATE;
-	bio->bi_rw = 0;
-	bio->bi_vcnt = 0;
-	bio->bi_idx = 0;
-	bio->bi_phys_segments = 0;
-	bio->bi_hw_segments = 0;
-	bio->bi_size = 0;
-	bio->bi_max_vecs = 0;
-	bio->bi_end_io = NULL;
-	atomic_set(&bio->bi_cnt, 1);
-	bio->bi_private = NULL;
-}
-
 static unsigned _bio_count = 0;
 struct bio *bio_set_alloc(struct bio_set *bs, int gfp_mask, int nr_iovecs)
 {
@@ -267,7 +251,7 @@ static int resize_pool(unsigned int new_ios)
 		/* create new pool */
 		_io_pool = mempool_create(new_ios, alloc_io, free_io, NULL);
 		if (!_io_pool)
-			r = -ENOMEM;
+			return -ENOMEM;
 
 		r = bio_set_init(&_bios, "dm-io", 512, 1);
 		if (r) {