Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1403282

[PATCH v3 5/5] libnvdimm: release ida resources

Show all headers | View raw

ida instances allocate some internal memory for ->free_bitmap in
addition to the base 'struct ida'.  Use ida_destroy() to release that
memory at module_exit().

Reported-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/nvdimm/core.c        |    3 +++
 drivers/nvdimm/dimm_devs.c   |    5 +++++
 drivers/nvdimm/nd-core.h     |    2 ++
 drivers/nvdimm/region_devs.c |    5 +++++
 4 files changed, 15 insertions(+)

diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 182a93fe3712..847532de087a 100644
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -648,6 +648,9 @@ static __exit void libnvdimm_exit(void)
 	nd_region_exit();
 	nvdimm_exit();
 	nvdimm_bus_exit();
+	nd_region_devs_exit();
+	nvdimm_devs_exit();
+	ida_destroy(&nd_ida);
 }
 
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index c56f88217924..6cca03eaa345 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -546,3 +546,8 @@ int nvdimm_bus_check_dimm_count(struct nvdimm_bus *nvdimm_bus, int dimm_count)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(nvdimm_bus_check_dimm_count);
+
+void __exit nvdimm_devs_exit(void)
+{
+	ida_destroy(&dimm_ida);
+}
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
index cb65308c0329..4136c1a82539 100644
--- a/drivers/nvdimm/nd-core.h
+++ b/drivers/nvdimm/nd-core.h
@@ -49,6 +49,8 @@ bool is_nd_blk(struct device *dev);
 struct nvdimm_bus *walk_to_nvdimm_bus(struct device *nd_dev);
 int __init nvdimm_bus_init(void);
 void nvdimm_bus_exit(void);
+void nvdimm_devs_exit(void);
+void nd_region_devs_exit(void);
 void nd_region_probe_success(struct nvdimm_bus *nvdimm_bus, struct device *dev);
 struct nd_region;
 void nd_region_create_blk_seed(struct nd_region *nd_region);
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index 9e1b054e0e61..40fcfea26fbb 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -793,3 +793,8 @@ struct nd_region *nvdimm_volatile_region_create(struct nvdimm_bus *nvdimm_bus,
 			__func__);
 }
 EXPORT_SYMBOL_GPL(nvdimm_volatile_region_create);
+
+void __exit nd_region_devs_exit(void)
+{
+	ida_destroy(&region_ida);
+}

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/5] "Device DAX" for persistent memory Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
  [PATCH v3 3/5] /dev/dax, core: file operations and dax-mmap Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
    Re: [PATCH v3 3/5] /dev/dax, core: file operations and dax-mmap Johannes Thumshirn <jthumshirn@suse.de> - 2016-05-20 10:00 +0200
  [PATCH v3 5/5] libnvdimm: release ida resources Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
    Re: [PATCH v3 5/5] libnvdimm: release ida resources Johannes Thumshirn <jthumshirn@suse.de> - 2016-05-20 09:40 +0200
  [PATCH v3 4/5] Revert "block: enable dax for raw block devices" Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
  [PATCH v3 1/5] libnvdimm: stop requiring a driver ->remove() method Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
    Re: [PATCH v3 1/5] libnvdimm: stop requiring a driver ->remove()  method Johannes Thumshirn <jthumshirn@suse.de> - 2016-05-20 09:40 +0200
  [PATCH v3 2/5] /dev/dax, pmem: direct access to persistent memory Dan Williams <dan.j.williams@intel.com> - 2016-05-18 23:00 +0200
    Re: [PATCH v3 2/5] /dev/dax, pmem: direct access to persistent memory Johannes Thumshirn <jthumshirn@suse.de> - 2016-05-20 10:10 +0200
    Re: [PATCH v3 2/5] /dev/dax, pmem: direct access to persistent memory Xiong Zhou <xzhou@redhat.com> - 2016-05-20 11:50 +0200

csiph-web