---

yaml --- r: 123311 b: refs/heads/master c: d3f7611 h: refs/heads/master i: 123309: f26a53b 123307: fd27718 123303: a73e99d 123295: 0e49285 v: v3
git-mirror · Dec 29, 2008 · ccbc105 · ccbc105
1 parent bcf3b35
commit ccbc105
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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);