Merge branch 'master' in devel-3.0

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index a0d6097e7fbb8b3d5e08a84a9d2e47ca802f0aaf..1fef4b998524cfac4382644624e19683be6cc389 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -437,7 +437,6 @@ int main(int argc, char *argv[])
                                exit(2);
 
                        case 5:
-                       case 6:
                                layout = map_name(r5layout, optarg);
                                if (layout==UnSet) {
                                        fprintf(stderr, Name ": layout %s not understood for raid5.\n",
@@ -445,6 +444,14 @@ int main(int argc, char *argv[])
                                        exit(2);
                                }
                                break;
+                       case 6:
+                               layout = map_name(r6layout, optarg);
+                               if (layout==UnSet) {
+                                       fprintf(stderr, Name ": layout %s not understood for raid6.\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                               break;
 
                        case 10:
                                /* 'f', 'o' or 'n' followed by a number <= raid_disks */
@@ -644,6 +651,7 @@ int main(int argc, char *argv[])
                "     'summaries', 'homehost', 'byteorder', 'devicesize'.\n");
                        exit(outf == stdout ? 0 : 2);
 
+               case O(INCREMENTAL,NoDegraded):
                case O(ASSEMBLE,NoDegraded): /* --no-degraded */
                        runstop = -1; /* --stop isn't allowed for --assemble,
                                       * so we overload slightly */
@@ -1241,6 +1249,7 @@ int main(int argc, char *argv[])
                                                        rv |= WaitClean(name, v);
                                                put_md_name(name);
                                        }
+                                       free_mdstat(ms);
                                } else  if (devmode == 'S' && scan) {
                                        /* apply --stop to all devices in /proc/mdstat */
                                        /* Due to possible stacking of devices, repeat until
@@ -1273,6 +1282,7 @@ int main(int argc, char *argv[])
 
                                                        put_md_name(name);
                                                }
+                                               free_mdstat(ms);
                                        } while (!last && err);
                                        if (err) rv |= 1;
                                } else {