---

yaml --- r: 71999 b: refs/heads/master c: 9b61764 h: refs/heads/master i: 71997: e3b51b5 71995: d8d481d 71991: 66b835f 71983: f3af037 71967: 8266552 71935: a69fa14 v: v3
git-mirror · Oct 22, 2007 · 969f3b3 · 969f3b3
1 parent 37ec76a
commit 969f3b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82f66fbef58de4ad7519708d0b9e685e20fa4e8a
+refs/heads/master: 9b61764bcb4360e04386f0415a01da8271631004
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
@@ -1354,15 +1354,19 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 			else
 				sg = sg_next(sg);
 
-			memset(sg, 0, sizeof(*sg));
-			sg->page = bvec->bv_page;
+			sg_dma_len(sg) = 0;
+			sg_dma_address(sg) = 0;
+			sg_set_page(sg, bvec->bv_page);
 			sg->length = nbytes;
 			sg->offset = bvec->bv_offset;
 			nsegs++;
 		}
 		bvprv = bvec;
 	} /* segments in rq */
 
+	if (sg)
+		__sg_mark_end(sg);
+
 	return nsegs;
 }