imsm: add support for checkpointing via 'curr_migr_unit'

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index 0c51d63867840749861342b4e9f64fede2be53a2..74a39a88584b9bf4ac9885d9b21f534f8d8175f2 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1361,7 +1361,16 @@ int main(int argc, char *argv[])
                                                     export, test, homehost);
                                        continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force, quiet,0);
+                                       if (ss)
+                                               rv |= Kill(dv->devname, ss, force, quiet,0);
+                                       else {
+                                               int q = quiet;
+                                               do {
+                                                       rv |= Kill(dv->devname, NULL, force, q, 0);
+                                                       q = 1;
+                                               } while ((rv & 2) == 0);
+                                               rv &= ~2;
+                                       }
                                        continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
@@ -1417,9 +1426,18 @@ int main(int argc, char *argv[])
                if (array_size >= 0) {
                        /* alway impose array size first, independent of
                         * anything else
+                        * Do not allow level or raid_disks changes at the
+                        * same time as that can be irreversibly destructive.
                         */
                        struct mdinfo sra;
                        int err;
+                       if (raiddisks || level != UnSet) {
+                               fprintf(stderr, Name ": cannot change array size in same operation "
+                                       "as changing raiddisks or level.\n"
+                                       "    Change size first, then check that data is still intact.\n");
+                               rv = 1;
+                               break;
+                       }
                        sysfs_init(&sra, mdfd, 0);
                        if (array_size == 0)
                                err = sysfs_set_str(&sra, NULL, "array_size", "default");