diff options
| author | Dan Williams | 2016-01-05 08:50:23 +0100 |
|---|---|---|
| committer | Dan Williams | 2016-01-09 17:39:04 +0100 |
| commit | b95f5f4391fad65f1819c2404080b05ca95bdd92 (patch) | |
| tree | 677c1af2ab624785340dc655b3414a21dc51a930 /drivers/nvdimm/pmem.c | |
| parent | libnvdimm: don't fail init for full badblocks list (diff) | |
| download | kernel-qcow2-linux-b95f5f4391fad65f1819c2404080b05ca95bdd92.tar.gz kernel-qcow2-linux-b95f5f4391fad65f1819c2404080b05ca95bdd92.tar.xz kernel-qcow2-linux-b95f5f4391fad65f1819c2404080b05ca95bdd92.zip | |
libnvdimm: convert to statically allocated badblocks
If a device will ever have badblocks it should always have a badblocks
instance available. So, similar to md, embed a badblocks instance in
pmem_device. This reduces pointer chasing in the i/o fast path, and
simplifies the init path.
Reported-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/pmem.c')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 65b2056e7540..2b1f3009f827 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -23,6 +23,7 @@ #include <linux/module.h> #include <linux/memory_hotplug.h> #include <linux/moduleparam.h> +#include <linux/badblocks.h> #include <linux/vmalloc.h> #include <linux/slab.h> #include <linux/pmem.h> @@ -41,6 +42,7 @@ struct pmem_device { phys_addr_t data_offset; void __pmem *virt_addr; size_t size; + struct badblocks bb; }; static int pmem_major; @@ -168,7 +170,6 @@ static int pmem_attach_disk(struct device *dev, { int nid = dev_to_node(dev); struct gendisk *disk; - int ret; pmem->pmem_queue = blk_alloc_queue_node(GFP_KERNEL, nid); if (!pmem->pmem_queue) @@ -196,10 +197,9 @@ static int pmem_attach_disk(struct device *dev, disk->driverfs_dev = dev; set_capacity(disk, (pmem->size - pmem->data_offset) / 512); pmem->pmem_disk = disk; - - ret = nvdimm_namespace_add_poison(disk, pmem->data_offset, ndns); - if (ret) - return ret; + if (devm_init_badblocks(dev, &pmem->bb)) + return -ENOMEM; + nvdimm_namespace_add_poison(ndns, &pmem->bb, pmem->data_offset); add_disk(disk); revalidate_disk(disk); |