From 15c7efc4f64fe896103e231b4b9878c310a61cf0 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Thu, 10 Feb 2011 08:49:59 -0500
Subject: [PATCH] --- yaml --- r: 286255 b: refs/heads/master c:
 51882d00f07da9601cc962a3596e48aafb4f4163 h: refs/heads/master i:   286253:
 574d77be1adc44e69008feb31dc8dbbcb9bbb1ff   286251:
 83058348201d730b5bf3b71ad32ed9849ed0358a   286247:
 19dc7ddf9e473940fd464b407facc84ced511274   286239:
 7ba2c60e4534ec9d281c822f63903cf8cc408c75 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/nvme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e699afc5525e..3656401da092 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d8703481f60d67f49e3177196cbe474b11377c
+refs/heads/master: 51882d00f07da9601cc962a3596e48aafb4f4163
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 71bdf6f2c93b..903e7f15b60d 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -321,6 +321,7 @@ static int nvme_map_bio(struct device *dev, struct nvme_req_info *info,
 	sg_init_table(sg, psegs);
 	bio_for_each_segment(bvec, bio, i) {
 		sg_set_page(sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset);
+		sg++;
 		/* XXX: handle non-mergable here */
 		nsegs++;
 	}