Merge remote-tracking branch 'ext3/for_next'

[deliverable/linux.git] / drivers / nvdimm / dimm.c

diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c
index 28001a6ccd4ecbb0946490213af5ba730555266a..71d12bb67339148bac8edc2e70c907aff1852f5a 100644 (file)
--- a/drivers/nvdimm/dimm.c
+++ b/drivers/nvdimm/dimm.c
@@ -18,20 +18,9 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/nd.h>
+#include "label.h"
 #include "nd.h"
 
-static void free_data(struct nvdimm_drvdata *ndd)
-{
-       if (!ndd)
-               return;
-
-       if (ndd->data && is_vmalloc_addr(ndd->data))
-               vfree(ndd->data);
-       else
-               kfree(ndd->data);
-       kfree(ndd);
-}
-
 static int nvdimm_probe(struct device *dev)
 {
        struct nvdimm_drvdata *ndd;
@@ -42,7 +31,14 @@ static int nvdimm_probe(struct device *dev)
                return -ENOMEM;
 
        dev_set_drvdata(dev, ndd);
+       ndd->dpa.name = dev_name(dev);
+       ndd->ns_current = -1;
+       ndd->ns_next = -1;
+       ndd->dpa.start = 0;
+       ndd->dpa.end = -1;
        ndd->dev = dev;
+       get_device(dev);
+       kref_init(&ndd->kref);
 
        rc = nvdimm_init_nsarea(ndd);
        if (rc)
@@ -54,10 +50,21 @@ static int nvdimm_probe(struct device *dev)
 
        dev_dbg(dev, "config data size: %d\n", ndd->nsarea.config_size);
 
+       nvdimm_bus_lock(dev);
+       ndd->ns_current = nd_label_validate(ndd);
+       ndd->ns_next = nd_label_next_nsindex(ndd->ns_current);
+       nd_label_copy(ndd, to_next_namespace_index(ndd),
+                       to_current_namespace_index(ndd));
+       rc = nd_label_reserve_dpa(ndd);
+       nvdimm_bus_unlock(dev);
+
+       if (rc)
+               goto err;
+
        return 0;
 
  err:
-       free_data(ndd);
+       put_ndd(ndd);
        return rc;
 }
 
@@ -65,7 +72,10 @@ static int nvdimm_remove(struct device *dev)
 {
        struct nvdimm_drvdata *ndd = dev_get_drvdata(dev);
 
-       free_data(ndd);
+       nvdimm_bus_lock(dev);
+       dev_set_drvdata(dev, NULL);
+       nvdimm_bus_unlock(dev);
+       put_ndd(ndd);
 
        return 0;
 }
@@ -84,7 +94,7 @@ int __init nvdimm_init(void)
        return nd_driver_register(&nvdimm_driver);
 }
 
-void __exit nvdimm_exit(void)
+void nvdimm_exit(void)
 {
        driver_unregister(&nvdimm_driver.drv);
 }