Revert "Incremental: honor --no-degraded to delay assembly"

This reverts commit fdb482f99b9ad2ef8cd1724902fdfeedaa8796a1.

Now that containers can report state for ->container_enough we can
automatically determine when the array can be started, and no longer
need the --no-degraded hammer.

Conflicts:

	Incremental.c

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/Incremental.c b/Incremental.c
index adef44ee96248faeec116e258a5229d1038212e9..d6dd0f43bef1e84786cb7dfb9fb75607edff3856 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -437,8 +437,6 @@ int Incremental(char *devname, int verbose, int runstop,
                                chosen_name, info.array.working_disks);
                wait_for(chosen_name, mdfd);
                close(mdfd);
-               if (runstop < 0)
-                       return 0; /* don't try to assemble */
                rv = Incremental(chosen_name, verbose, runstop,
                                 NULL, homehost, require_homehost, autof);
                if (rv == 1)
@@ -452,8 +450,7 @@ int Incremental(char *devname, int verbose, int runstop,
        active_disks = count_active(st, mdfd, &avail, &info);
        if (enough(info.array.level, info.array.raid_disks,
                   info.array.layout, info.array.state & 1,
-                  avail, active_disks) == 0 ||
-           (runstop < 0 && active_disks < info.array.raid_disks)) {
+                  avail, active_disks) == 0) {
                free(avail);
                if (verbose >= 0)
                        fprintf(stderr, Name

diff --git a/mdadm.8 b/mdadm.8
index 4edfc41232c59ffaa008d3d624bd0ca0e321a27e..90470d9db514eb0806d7a353a779f1b57cd73c21 100644 (file)
--- a/mdadm.8
+++ b/mdadm.8
@@ -1218,11 +1218,6 @@ uses to help track which arrays are currently being assembled.
 Run any array assembled as soon as a minimal number of devices are
 available, rather than waiting until all expected devices are present.
 
-.TP
-.B \-\-no\-degraded
-This allows the hot-plug system to prevent arrays from running when it knows
-that more disks may arrive later in the discovery process.
-
 .TP
 .BR \-\-scan ", " \-s
 Only meaningful with

diff --git a/mdadm.c b/mdadm.c
index d5e34c074c034f99d289124422ab38d944e8feee..a401be2b93980f035f0c04dfd879082183567372 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -671,7 +671,6 @@ 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 */