Merge miscellaneous libnvdimm updates for 4.21

[linux-2.6-microblaze.git] / drivers / nvdimm / region_devs.c

diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index e7377f1..e2818f9 100644 (file)
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -79,6 +79,11 @@ int nd_region_activate(struct nd_region *nd_region)
                struct nd_mapping *nd_mapping = &nd_region->mapping[i];
                struct nvdimm *nvdimm = nd_mapping->nvdimm;
 
+               if (test_bit(NDD_SECURITY_OVERWRITE, &nvdimm->flags)) {
+                       nvdimm_bus_unlock(&nd_region->dev);
+                       return -EBUSY;
+               }
+
                /* at least one null hint slot per-dimm for the "no-hint" case */
                flush_data_size += sizeof(void *);
                num_flush = min_not_zero(num_flush, nvdimm->num_flush);