---

yaml --- r: 85891 b: refs/heads/master c: db0a2e0 h: refs/heads/master i: 85889: 8a0911c 85887: 7b88cee v: v3
git-mirror · Feb 19, 2008 · c912a63 · c912a63
1 parent f2585b1
commit c912a63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb98e8414c42cb14698833aac640b143b9ade4f
+refs/heads/master: db0a2e0099be3a1cff55879225881465f16c67d3
diff --git a/trunk/block/blk-merge.c b/trunk/block/blk-merge.c
@@ -221,6 +221,9 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 	} /* segments in rq */
 
 	if (q->dma_drain_size && q->dma_drain_needed(rq)) {
+		if (rq->cmd_flags & REQ_RW)
+			memset(q->dma_drain_buffer, 0, q->dma_drain_size);
+
 		sg->page_link &= ~0x02;
 		sg = sg_next(sg);
 		sg_set_page(sg, virt_to_page(q->dma_drain_buffer),