From 084e66f3eb76c5cf9126b80028e1e55a2bce0368 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 17 Oct 2007 19:34:11 +0200
Subject: [PATCH] --- yaml --- r: 70937 b: refs/heads/master c:
 ba951841ceb7fa5b06ad48caa5270cc2ae17941e h: refs/heads/master i:   70935:
 b12db9a34cb91a242280bc3a01d0a1e3a7180fbc v: v3

---
 [refs]                  |  2 +-
 trunk/block/ll_rw_blk.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 427457f97226..34c9ce0fa5ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3bec5c5aea0da263111c4d8f8eabc1f8560d7bf
+refs/heads/master: ba951841ceb7fa5b06ad48caa5270cc2ae17941e
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 9e3f3cc85d0d..3935469e3662 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -1322,8 +1322,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 		  struct scatterlist *sglist)
 {
 	struct bio_vec *bvec, *bvprv;
-	struct scatterlist *next_sg, *sg;
 	struct req_iterator iter;
+	struct scatterlist *sg;
 	int nsegs, cluster;
 
 	nsegs = 0;
@@ -1333,7 +1333,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 	 * for each bio in rq
 	 */
 	bvprv = NULL;
-	sg = next_sg = &sglist[0];
+	sg = NULL;
 	rq_for_each_segment(bvec, rq, iter) {
 		int nbytes = bvec->bv_len;
 
@@ -1349,8 +1349,10 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 			sg->length += nbytes;
 		} else {
 new_segment:
-			sg = next_sg;
-			next_sg = sg_next(sg);
+			if (!sg)
+				sg = sglist;
+			else
+				sg = sg_next(sg);
 
 			memset(sg, 0, sizeof(*sg));
 			sg->page = bvec->bv_page;