Release 3.2.6 - stability release

[thirdparty/mdadm.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index 29bde18a5eacfee892ecec9bba700e9b62d35f8e..c987d107c5d0ca1e29a3ad2a7e2fd81ef01ec786 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -211,6 +211,8 @@ static void signal_manager(void)
  *
  */
 
+#define ARRAY_DIRTY 1
+#define ARRAY_BUSY 2
 static int read_and_act(struct active_array *a)
 {
        unsigned long long sync_completed;
@@ -218,7 +220,7 @@ static int read_and_act(struct active_array *a)
        int check_reshape = 0;
        int deactivate = 0;
        struct mdinfo *mdi;
-       int dirty = 0;
+       int ret = 0;
        int count = 0;
 
        a->next_state = bad_word;
@@ -254,14 +256,14 @@ static int read_and_act(struct active_array *a)
        if (a->curr_state == write_pending) {
                a->container->ss->set_array_state(a, 0);
                a->next_state = active;
-               dirty = 1;
+               ret |= ARRAY_DIRTY;
        }
        if (a->curr_state == active_idle) {
                /* Set array to 'clean' FIRST, then mark clean
                 * in the metadata
                 */
                a->next_state = clean;
-               dirty = 1;
+               ret |= ARRAY_DIRTY;
        }
        if (a->curr_state == clean) {
                a->container->ss->set_array_state(a, 1);
@@ -269,7 +271,7 @@ static int read_and_act(struct active_array *a)
        if (a->curr_state == active ||
            a->curr_state == suspended ||
            a->curr_state == bad_word)
-               dirty = 1;
+               ret |= ARRAY_DIRTY;
        if (a->curr_state == readonly) {
                /* Well, I'm ready to handle things.  If readonly
                 * wasn't requested, transition to read-auto.
@@ -284,7 +286,7 @@ static int read_and_act(struct active_array *a)
                                a->next_state = read_auto; /* array is clean */
                        else {
                                a->next_state = active; /* Now active for recovery etc */
-                               dirty = 1;
+                               ret |= ARRAY_DIRTY;
                        }
                }
        }
@@ -418,9 +420,9 @@ static int read_and_act(struct active_array *a)
                if ((mdi->next_state & DS_REMOVE) && mdi->state_fd >= 0) {
                        int remove_result;
 
-                       /* the kernel may not be able to immediately remove the
-                        * disk, we can simply wait until the next event to try
-                        * again.
+                       /* The kernel may not be able to immediately remove the
+                        * disk.  In that case we wait a little while and
+                        * try again.
                         */
                        remove_result = write_attr("remove", mdi->state_fd);
                        if (remove_result > 0) {
@@ -428,7 +430,8 @@ static int read_and_act(struct active_array *a)
                                close(mdi->state_fd);
                                close(mdi->recovery_fd);
                                mdi->state_fd = -1;
-                       }
+                       } else
+                               ret |= ARRAY_BUSY;
                }
                if (mdi->next_state & DS_INSYNC) {
                        write_attr("+in_sync", mdi->state_fd);
@@ -459,7 +462,7 @@ static int read_and_act(struct active_array *a)
        if (deactivate)
                a->container = NULL;
 
-       return dirty;
+       return ret;
 }
 
 static struct mdinfo *
@@ -596,7 +599,7 @@ static int wait_and_act(struct supertype *container, int nowait)
                struct timespec ts;
                ts.tv_sec = 24*3600;
                ts.tv_nsec = 0;
-               if (*aap == NULL) {
+               if (*aap == NULL || container->retry_soon) {
                        /* just waiting to get O_EXCL access */
                        ts.tv_sec = 0;
                        ts.tv_nsec = 20000000ULL;
@@ -611,7 +614,7 @@ static int wait_and_act(struct supertype *container, int nowait)
                #ifdef DEBUG
                dprint_wake_reasons(&rfds);
                #endif
-
+               container->retry_soon = 0;
        }
 
        if (update_queue) {
@@ -629,7 +632,6 @@ static int wait_and_act(struct supertype *container, int nowait)
        rv = 0;
        dirty_arrays = 0;
        for (a = *aap; a ; a = a->next) {
-               int is_dirty;
 
                if (a->replaces && !discard_this) {
                        struct active_array **ap;
@@ -644,15 +646,17 @@ static int wait_and_act(struct supertype *container, int nowait)
                        signal_manager();
                }
                if (a->container && !a->to_remove) {
-                       is_dirty = read_and_act(a);
+                       int ret = read_and_act(a);
                        rv |= 1;
-                       dirty_arrays += is_dirty;
+                       dirty_arrays += !!(ret & ARRAY_DIRTY);
                        /* when terminating stop manipulating the array after it
                         * is clean, but make sure read_and_act() is given a
                         * chance to handle 'active_idle'
                         */
-                       if (sigterm && !is_dirty)
+                       if (sigterm && !(ret & ARRAY_DIRTY))
                                a->container = NULL; /* stop touching this array */
+                       if (ret & ARRAY_BUSY)
+                               container->retry_soon = 1;
                }
        }