[PATCH 3/3] namespace-action: Drop zero namespace checks.

From: Santosh Sivaraj <santosh(a)fossix.org&gt; With seed namespaces catched early on these checks for sizes in enable and destroy namespace code path are not needed. Link: https://patchwork.kernel.org/patch/11739975/ Signed-off-by: Santosh Sivaraj <santosh(a)fossix.org&gt; [rebased on top of the previous patches] Signed-off-by: Michal Suchanek <msuchanek(a)suse.de&gt; --- ndctl/lib/libndctl.c | 5 ----- ndctl/namespace.c | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 952192c4c6b5..ecced5a3ae0b 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -4253,16 +4253,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 835f4076008a..65bca9191603 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -1094,7 +1094,6 @@ static int namespace_destroy(struct ndctl_region *region, struct ndctl_namespace *ndns) { const char *devname = ndctl_namespace_get_devname(ndns); - unsigned long long size; bool did_zero = false; int rc; @@ -1139,19 +1138,9 @@ static int namespace_destroy(struct ndctl_region *region, goto out; } - size = ndctl_namespace_get_size(ndns); - rc = ndctl_namespace_delete(ndns); if (rc) 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; - out: return rc; } -- 2.28.0