| Message ID | 20200510153207.19296-1-redhairer.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] ndctl/namespace: Fix disable-namespace accounting relative to seed devices | expand |
diff --git a/ndctl/namespace.c b/ndctl/namespace.c index 0550580..1bfe736 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -2034,6 +2034,7 @@ static int do_xaction_namespace(const char *namespace, struct ndctl_region *region; const char *ndns_name; struct ndctl_bus *bus; + unsigned long long size; *processed = 0; @@ -2134,7 +2135,8 @@ static int do_xaction_namespace(const char *namespace, switch (action) { case ACTION_DISABLE: rc = ndctl_namespace_disable_safe(ndns); - if (rc == 0) + size = ndctl_namespace_get_size(ndns); + if (rc == 0 && size != 0) (*processed)++; break; case ACTION_ENABLE:
Seed namespaces are included in "ndctl disable-namespace all". However since the user never "creates" them it is surprising to see "disable-namespace" report 1 more namespace relative to the number that have been created. Catch attempts to disable a zero-sized namespace: Before: { "dev":"namespace1.0", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1" } { "dev":"namespace1.1", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1.1" } { "dev":"namespace1.2", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1.2" } disabled 4 namespaces After: { "dev":"namespace1.0", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1" } { "dev":"namespace1.3", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1.3" } { "dev":"namespace1.1", "size":"492.00 MiB (515.90 MB)", "blockdev":"pmem1.1" } disabled 3 namespaces Signed-off-by: Redhairer Li <redhairer.li@intel.com> --- ndctl/namespace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)