ddf: Set container_member from subarray in getinfo_super.

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index 641d7170ed243e721a41f72b380e43ad52d68c1e..6fe6b99f3024bd88c7a569c5c59e5b4c32f2ee8b 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1257,6 +1257,16 @@ int main(int argc, char *argv[])
 
                                                        put_md_name(name);
                                                }
+                                               /* This is a bit of a hack.
+                                                * When we stop an array in a container, it
+                                                * takes a moment for mdmon to let go.
+                                                * So just pause briefly incase that is
+                                                * happening.  Maybe we should do something
+                                                * more deterministic via the socket.
+                                                */
+                                               if (progress && err)
+                                                       usleep(50000);
+
                                        } while (!last && err);
                                        if (err) rv |= 1;
                                } else {
@@ -1272,7 +1282,8 @@ int main(int argc, char *argv[])
                                                     export, test, homehost);
                                        continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force, quiet); continue;
+                                       rv |= Kill(dv->devname, force, quiet,0);
+                                       continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
                                case 'X':