2 files changed, 12 insertions, 12 deletions

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index a518cb1b59d4..ce3e8dfa10ad 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -52,17 +52,17 @@ static void namespace_blk_release(struct device *dev)
         kfree(nsblk);
 }
 
-static struct device_type namespace_io_device_type = {
+static const struct device_type namespace_io_device_type = {
         .name = "nd_namespace_io",
         .release = namespace_io_release,
 };
 
-static struct device_type namespace_pmem_device_type = {
+static const struct device_type namespace_pmem_device_type = {
         .name = "nd_namespace_pmem",
         .release = namespace_pmem_release,
 };
 
-static struct device_type namespace_blk_device_type = {
+static const struct device_type namespace_blk_device_type = {
         .name = "nd_namespace_blk",
         .release = namespace_blk_release,
 };
@@ -962,8 +962,8 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
         struct nvdimm_drvdata *ndd;
         struct nd_label_id label_id;
         u32 flags = 0, remainder;
+        int rc, i, id = -1;
         u8 *uuid = NULL;
-        int rc, i;
 
         if (dev->driver || ndns->claim)
                 return -EBUSY;
@@ -972,11 +972,13 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
                 struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                 uuid = nspm->uuid;
+                id = nspm->id;
         } else if (is_namespace_blk(dev)) {
                 struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
 
                 uuid = nsblk->uuid;
                 flags = NSLABEL_FLAG_LOCAL;
+                id = nsblk->id;
         }
 
         /*
@@ -1039,10 +1041,11 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
 
         /*
          * Try to delete the namespace if we deleted all of its
-         * allocation, this is not the seed device for the region, and
-         * it is not actively claimed by a btt instance.
+         * allocation, this is not the seed or 0th device for the
+         * region, and it is not actively claimed by a btt, pfn, or dax
+         * instance.
          */
-        if (val == 0 && nd_region->ns_seed != dev && !ndns->claim)
+        if (val == 0 && id != 0 && nd_region->ns_seed != dev && !ndns->claim)
                 nd_device_unregister(dev, ND_ASYNC);
 
         return rc;
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index a2ac9e641aa9..6c033c9a2f06 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -627,15 +627,12 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
         size = resource_size(&nsio->res);
         npfns = (size - start_pad - end_trunc - SZ_8K) / SZ_4K;
         if (nd_pfn->mode == PFN_MODE_PMEM) {
-                unsigned long memmap_size;
-
                 /*
                  * vmemmap_populate_hugepages() allocates the memmap array in
                  * HPAGE_SIZE chunks.
                  */
-                memmap_size = ALIGN(64 * npfns, HPAGE_SIZE);
-                offset = ALIGN(start + SZ_8K + memmap_size + dax_label_reserve,
-                                nd_pfn->align) - start;
+                offset = ALIGN(start + SZ_8K + 64 * npfns + dax_label_reserve,
+                                max(nd_pfn->align, HPAGE_SIZE)) - start;
         } else if (nd_pfn->mode == PFN_MODE_RAM)
                 offset = ALIGN(start + SZ_8K + dax_label_reserve,
                                 nd_pfn->align) - start;