ndctl/dimm: Fix init-labels success reporting (bsc#1156308 ltc#181441).

Review, please.

old: hardware:nvdimm/ndctl
new: home:michals/ndctl rev None
Index: ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch
===================================================================
--- ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch (revision 35)
+++ ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch (revision 8)
@@ -4,7 +4,7 @@
 Subject: [PATCH] ndctl: Reuse the align value from the original namespace on
  reconfiguration
 
-Patch-mainline: expected v67
+Patch-mainline: v67
 Git-commit: e81ccd7f062beeae7498d04785fe55c55c857d4b
 
 When using reconfigure command to add a 'name' to the namespace we end
Index: ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch
===================================================================
--- ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch (revision 35)
+++ ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch (revision 8)
@@ -3,7 +3,7 @@
 Date: Wed, 7 Aug 2019 10:51:39 -0700
 Subject: [PATCH] ndctl/lib: Fix duplicate bus detection
 
-Patch-mainline: expected v67
+Patch-mainline: v67
 Git-commit: d961a474be65c8195bb069c470b01f951bd2eb90
 
 After an ndctl_invalidate() event the next add_bus() invocation attempts
Index: ndctl.changes
===================================================================
--- ndctl.changes (revision 35)
+++ ndctl.changes (revision 8)
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Nov  8 14:42:49 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
+
+- ndctl/dimm: Fix init-labels success reporting (bsc#1156308 ltc#181441).
+  + ndctl-dimm-Fix-init-labels-success-reporting.patch
+- Refresh patches with upstream status:
+   ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch
+   ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch
+
+-------------------------------------------------------------------
 Fri Oct 18 13:14:35 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
 
 - Refresh patches with upstream status:
Index: ndctl-dimm-Fix-init-labels-success-reporting.patch
===================================================================
--- ndctl-dimm-Fix-init-labels-success-reporting.patch (added)
+++ ndctl-dimm-Fix-init-labels-success-reporting.patch (revision 8)
@@ -0,0 +1,64 @@
+From 4f7cad25e06483ae20b9bebabefb05fb1e55a2a7 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dan.j.williams@intel.com>
+Date: Sat, 27 Jul 2019 14:40:42 -0700
+Subject: [PATCH] ndctl/dimm: Fix init-labels success reporting
+
+Patch-mainline: v66
+Git-commit: 4f7cad25e06483ae20b9bebabefb05fb1e55a2a7
+
+When a DIMM is disabled due to a label parsing issue "ndctl init-labels"
+mis-reports the status of the init-labels command:
+
+    # ndctl init-labels all -f
+    initialized 1 nmem
+    [root@dwillia2-dev ndctl]# ndctl list -Di
+    [
+      {
+        "dev":"nmem1",
+        "id":"8680-57341200",
+        "handle":2,
+        "phys_id":0,
+        "state":"disabled"
+      },
+      {
+        "dev":"nmem0",
+        "id":"8680-56341200",
+        "handle":1,
+        "phys_id":0
+      }
+    ]
+    # ndctl init-labels nmem1 -f
+    initialized 1020 nmems
+
+Catch any positive return from action_init() as success:
+
+    # ndctl init-labels all -f
+    initialized 2 nmems
+    # ndctl init-labels nmem1 -f
+    initialized 1 nmem
+
+Link: https://github.com/pmem/ndctl/issues/60
+Reported-by: Jane Chu <jane.chu@oracle.com>
+Reported-by: Steve Scargal <steve.scargall@intel.com>
+Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
+---
+ ndctl/dimm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ndctl/dimm.c b/ndctl/dimm.c
+index 5f05a75f00eb..db91f42421e4 100644
+--- a/ndctl/dimm.c
++++ b/ndctl/dimm.c
+@@ -1027,7 +1027,7 @@ static int __action_init(struct ndctl_dimm *dimm,
+ 
+  out:
+ 	ndctl_cmd_unref(cmd_read);
+-	return rc;
++	return rc >= 0 ? 0 : rc;
+ }
+ 
+ static int action_init(struct ndctl_dimm *dimm, struct action_context *actx)
+-- 
+2.23.0
+

• Files Changed
• Browse Source