summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-07-10 02:46:29 +0300
committerDan Williams <dan.j.williams@intel.com>2016-07-12 02:13:41 +0300
commita8f720224eff09ea684b7f74aa1c0dff3da03170 (patch)
tree3914536575ff797fc49c28406e4fce684eff4907 /drivers
parent85d3fa02e4f8b4f59b9ae3f6f7d8312a1dcf28c8 (diff)
downloadlinux-a8f720224eff09ea684b7f74aa1c0dff3da03170.tar.xz
libnvdimm: keep region data alive over namespace removal
nd_region device driver data will be used in the namespace i/o path. Re-order nd_region_remove() to ensure this data stays live across namespace device removal Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvdimm/region.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c
index 333175dac8d5..8f241772ec0b 100644
--- a/drivers/nvdimm/region.c
+++ b/drivers/nvdimm/region.c
@@ -82,6 +82,8 @@ static int nd_region_remove(struct device *dev)
{
struct nd_region *nd_region = to_nd_region(dev);
+ device_for_each_child(dev, NULL, child_unregister);
+
/* flush attribute readers and disable */
nvdimm_bus_lock(dev);
nd_region->ns_seed = NULL;
@@ -91,7 +93,6 @@ static int nd_region_remove(struct device *dev)
dev_set_drvdata(dev, NULL);
nvdimm_bus_unlock(dev);
- device_for_each_child(dev, NULL, child_unregister);
return 0;
}