From ccbc10549a1efd71db887d6170a2dacb6a74baba Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 23 Dec 2008 12:46:21 +0100
Subject: [PATCH] --- yaml --- r: 123311 b: refs/heads/master c:
 d3f761104b097738932afcc310fbbbbfb007ef92 h: refs/heads/master i:   123309:
 f26a53bf38210993d3174acccd159ea19f480613   123307:
 fd27718607ede368eacbdc085448c0e91dd042c9   123303:
 a73e99dfe70c3522ec86f4abf4347b8494bf3430   123295:
 0e492853e9a2fb67f0ccec606dd832c1d79dcaa0 v: v3

---
 [refs]         | 2 +-
 trunk/fs/bio.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 45c3184a5201..7483b62fd3b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f735b5eeb9fcbb001e0cf2a5296b19c4bbaec55f
+refs/heads/master: d3f761104b097738932afcc310fbbbbfb007ef92
diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c
index 75e6be18ecd3..711cee103602 100644
--- a/trunk/fs/bio.c
+++ b/trunk/fs/bio.c
@@ -180,7 +180,7 @@ struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx,
 	 * kzalloc() for the exact number of vecs right away.
 	 */
 	if (!bs)
-		bvl = kzalloc(nr * sizeof(struct bio_vec), gfp_mask);
+		bvl = kmalloc(nr * sizeof(struct bio_vec), gfp_mask);
 
 	/*
 	 * see comment near bvec_array define!
@@ -237,9 +237,6 @@ struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx,
 		}
 	}
 
-	if (bvl)
-		memset(bvl, 0, bvec_nr_vecs(*idx) * sizeof(struct bio_vec));
-
 	return bvl;
 }
 
@@ -325,7 +322,6 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)
 				idx = 0;
 				bvl = bio->bi_inline_vecs;
 				nr_iovecs = BIO_INLINE_VECS;
-				memset(bvl, 0, BIO_INLINE_VECS * sizeof(*bvl));
 			} else {
 				bvl = bvec_alloc_bs(gfp_mask, nr_iovecs, &idx,
 							bs);