Do not gate zeroing on whether a namespace is claimed by a personality.
The namespace might not have been able to be claimed due to info-block
corruption.

Signed-off-by: Dan Williams <[email protected]>
---
 ndctl/namespace.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ndctl/namespace.c b/ndctl/namespace.c
index 9eec313c2d5b..645aa14882bb 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
@@ -930,9 +930,6 @@ static int namespace_destroy(struct ndctl_region *region,
                struct ndctl_namespace *ndns)
 {
        const char *devname = ndctl_namespace_get_devname(ndns);
-       struct ndctl_pfn *pfn = ndctl_namespace_get_pfn(ndns);
-       struct ndctl_dax *dax = ndctl_namespace_get_dax(ndns);
-       struct ndctl_btt *btt = ndctl_namespace_get_btt(ndns);
        bool did_zero = false;
        int rc;
 
@@ -954,13 +951,11 @@ static int namespace_destroy(struct ndctl_region *region,
 
        ndctl_namespace_set_enforce_mode(ndns, NDCTL_NS_MODE_RAW);
 
-       if (pfn || btt || dax) {
-               rc = zero_info_block(ndns);
-               if (rc < 0)
-                       return rc;
-               if (rc == 0)
-                       did_zero = true;
-       }
+       rc = zero_info_block(ndns);
+       if (rc < 0)
+               return rc;
+       if (rc == 0)
+               did_zero = true;
 
        switch (ndctl_namespace_get_type(ndns)) {
         case ND_DEVICE_NAMESPACE_PMEM:

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

Reply via email to