---

yaml --- r: 123310 b: refs/heads/master c: f735b5e h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · bcf3b35 · bcf3b35
1 parent f26a53b
commit bcf3b35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0ea8622918019ed76c0b85f5d0247809ba05a7c
+refs/heads/master: f735b5eeb9fcbb001e0cf2a5296b19c4bbaec55f
diff --git a/trunk/mm/bounce.c b/trunk/mm/bounce.c
@@ -198,8 +198,13 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
 		/*
 		 * irk, bounce it
 		 */
-		if (!bio)
-			bio = bio_alloc(GFP_NOIO, (*bio_orig)->bi_vcnt);
+		if (!bio) {
+			unsigned int cnt = (*bio_orig)->bi_vcnt;
+
+			bio = bio_alloc(GFP_NOIO, cnt);
+			memset(bio->bi_io_vec, 0, cnt * sizeof(struct bio_vec));
+		}
+
 
 		to = bio->bi_io_vec + i;