From: Santosh Sivaraj <[email protected]>
With seed namespaces catched early on these checks for sizes in enable
and destroy namespace code path are not needed.
Reverts commit b9cb03f6d5a8 ("ndctl/namespace: Fix enable-namespace
error for seed namespaces")
Reverts commit e01045e58ad5 ("ndctl/namespace: Fix destroy-namespace
accounting relative to seed devices")
Fixes: b9cb03f6d5a8 ("ndctl/namespace: Fix enable-namespace error for seed
namespaces")
Fixes: e01045e58ad5 ("ndctl/namespace: Fix destroy-namespace accounting
relative to seed devices")
Link: https://patchwork.kernel.org/patch/11739975/
Signed-off-by: Santosh Sivaraj <[email protected]>
[rebased on top of the previous patches]
Signed-off-by: Michal Suchanek <[email protected]>
---
ndctl/lib/libndctl.c | 5 -----
ndctl/namespace.c | 10 ----------
2 files changed, 15 deletions(-)
diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
index 36fb6fe0f4cf..9f50f76c57e4 100644
--- a/ndctl/lib/libndctl.c
+++ b/ndctl/lib/libndctl.c
@@ -4501,16 +4501,11 @@ NDCTL_EXPORT int ndctl_namespace_enable(struct
ndctl_namespace *ndns)
const char *devname = ndctl_namespace_get_devname(ndns);
struct ndctl_ctx *ctx = ndctl_namespace_get_ctx(ndns);
struct ndctl_region *region = ndns->region;
- unsigned long long size = ndctl_namespace_get_size(ndns);
int rc;
if (ndctl_namespace_is_enabled(ndns))
return 0;
- /* Don't try to enable idle namespace (no capacity allocated) */
- if (size == 0)
- return -ENXIO;
-
rc = ndctl_bind(ctx, ndns->module, devname);
/*
diff --git a/ndctl/namespace.c b/ndctl/namespace.c
index c3a058d8ff1a..4535372cb0f7 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
@@ -1161,15 +1161,12 @@ static int namespace_destroy(struct ndctl_region
*region,
struct ndctl_namespace *ndns)
{
const char *devname = ndctl_namespace_get_devname(ndns);
- unsigned long long size;
int rc;
rc = namespace_prep_reconfig(region, ndns);
if (rc < 0)
return rc;
- size = ndctl_namespace_get_size(ndns);
-
/* Labeled namespace, destroy label / allocation */
if (rc == 2) {
rc = ndctl_namespace_delete(ndns);
@@ -1177,13 +1174,6 @@ static int namespace_destroy(struct ndctl_region *region,
debug("%s: failed to reclaim\n", devname);
}
- /*
- * Don't report a destroyed namespace when no capacity was
- * allocated.
- */
- if (size == 0 && rc == 0)
- rc = 1;
-
return rc;
}
--
2.26.2
_______________________________________________
Linux-nvdimm mailing list -- [email protected]
To unsubscribe send an email to [email protected]
