libnvdimm, namespace: expand pmem device naming scheme for multi-pmem

pmem devices are currently named /dev/pmem<region-index>. Preserve the
naming of the 0th device, but add a ".<namespace-index>" for other
devices.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index f0536c2789e943be760dc8f25ba56bdd6e559c5c..132c5b8b5366c4baf467055549e265070bc37a3e 100644 (file)
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -173,7 +173,21 @@ const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
                suffix = "s";
 
        if (is_namespace_pmem(&ndns->dev) || is_namespace_io(&ndns->dev)) {
-               sprintf(name, "pmem%d%s", nd_region->id, suffix ? suffix : "");
+               int nsidx = 0;
+
+               if (is_namespace_pmem(&ndns->dev)) {
+                       struct nd_namespace_pmem *nspm;
+
+                       nspm = to_nd_namespace_pmem(&ndns->dev);
+                       nsidx = nspm->id;
+               }
+
+               if (nsidx)
+                       sprintf(name, "pmem%d.%d%s", nd_region->id, nsidx,
+                                       suffix ? suffix : "");
+               else
+                       sprintf(name, "pmem%d%s", nd_region->id,
+                                       suffix ? suffix : "");
        } else if (is_namespace_blk(&ndns->dev)) {
                struct nd_namespace_blk *nsblk;