From 7a17163216fa1bf007be79010ae556713f78553a Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Tue, 1 Feb 2011 12:49:38 -0500
Subject: [PATCH] --- yaml --- r: 286241 b: refs/heads/master c:
 388f037f4e7f0a24bac6b1a24f144f5d939f58cf h: refs/heads/master i:   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 433559745c48..688c70a007cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5911f20039ce59d7e7834f0c42151cf759b6f786
+refs/heads/master: 388f037f4e7f0a24bac6b1a24f144f5d939f58cf
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index e3d921577b94..744db3877c42 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -889,6 +889,7 @@ static struct nvme_ns *nvme_alloc_ns(struct nvme_dev *dev, int index,
 	disk->fops = &nvme_fops;
 	disk->private_data = ns;
 	disk->queue = ns->queue;
+	disk->driverfs_dev = &dev->pci_dev->dev;
 	sprintf(disk->disk_name, "nvme%dn%d", dev->instance, index);
 	set_capacity(disk, le64_to_cpup(&id->nsze) << (ns->lba_shift - 9));