---

yaml --- r: 72185 b: refs/heads/master c: 7aeacf9 h: refs/heads/master i: 72183: 4e9a3e2 v: v3
git-mirror · Oct 23, 2007 · 7328cb4 · 7328cb4
1 parent 32d263f
commit 7328cb4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad0d4083e65d9f223275adbfb9a7927e2120dc6c
+refs/heads/master: 7aeacf982203fb4dea2f3434eefdc268cfd5d6d9
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
@@ -1351,8 +1351,20 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 new_segment:
 			if (!sg)
 				sg = sglist;
-			else
+			else {
+				/*
+				 * If the driver previously mapped a shorter
+				 * list, we could see a termination bit
+				 * prematurely unless it fully inits the sg
+				 * table on each mapping. We KNOW that there
+				 * must be more entries here or the driver
+				 * would be buggy, so force clear the
+				 * termination bit to avoid doing a full
+				 * sg_init_table() in drivers for each command.
+				 */
+				sg->page_link &= ~0x02;
 				sg = sg_next(sg);
+			}
 
 			sg_set_page(sg, bvec->bv_page);
 			sg->length = nbytes;