libnvdimm: Set device node in nd_device_register

This change makes it so that we don't repeatedly overwrite the device node
for nvdimm regions. The earliest we can set the node is immediately after
calling device init, so I have moved the code there so we can avoid
rewriting the node with each uevent.

Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 9148015ed8036fc59a3ada2f364b558bd58201d9..f1fb39921236eafe80505965d86a16d1a44778de 100644 (file)
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -54,12 +54,6 @@ static int to_nd_device_type(struct device *dev)
 
 static int nvdimm_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-       /*
-        * Ensure that region devices always have their numa node set as
-        * early as possible.
-        */
-       if (is_nd_region(dev))
-               set_dev_node(dev, to_nd_region(dev)->numa_node);
        return add_uevent_var(env, "MODALIAS=" ND_DEVICE_MODALIAS_FMT,
                        to_nd_device_type(dev));
 }
@@ -508,6 +502,16 @@ void __nd_device_register(struct device *dev)
 {
        if (!dev)
                return;
+
+       /*
+        * Ensure that region devices always have their NUMA node set as
+        * early as possible. This way we are able to make certain that
+        * any memory associated with the creation and the creation
+        * itself of the region is associated with the correct node.
+        */
+       if (is_nd_region(dev))
+               set_dev_node(dev, to_nd_region(dev)->numa_node);
+
        dev->bus = &nvdimm_bus_type;
        if (dev->parent)
                get_device(dev->parent);