From 23123be6d4e7a8ca39a165e8dff85aa064db3b2c Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Fri, 6 Jan 2012 13:49:25 -0700
Subject: [PATCH] --- yaml --- r: 286319 b: refs/heads/master c:
 fe304c43c6d63e29ed4fc46a874d7a74313788c5 h: refs/heads/master i:   286317:
 c0438a720c9c50994bf62f7f176cb8b2908d2961   286315:
 0f5bd1ef4e5fb0ffa83d91fe80bcebd339d15159   286311:
 cdab126720dc0db6dd364344b40a17e566511d55   286303:
 a5dab53c1523e1dd27b9ec7209147b473d688e39 v: v3

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

diff --git a/[refs] b/[refs]
index 8c24a8deda7d..a778b38c35ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 497421880acecd0281d3182d534f3d28c927caec
+refs/heads/master: fe304c43c6d63e29ed4fc46a874d7a74313788c5
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 3f8cae9dc960..71fc9030b4df 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1045,6 +1045,7 @@ static struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
 		length -= (PAGE_SIZE - offset);
 		offset = 0;
 	}
+	sg_mark_end(&sg[i - 1]);
 
 	err = -ENOMEM;
 	nents = dma_map_sg(&dev->pci_dev->dev, sg, count,