diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:50:44 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:50:44 +0400 |
commit | 20d0ba040d767361c1d0c8a825b2a5e8bfdb39a6 (patch) | |
tree | 687a5eda9314ea76da64e234ba269d84345f7efe /monitor.c | |
parent | fef4f4267e21104887eba03b8ddec5e6a3fc9747 (diff) | |
parent | fed12d436b9803ad97d1f11cc8f312ab08c3a659 (diff) |
Merge tag 'mdadm-3.3.2' into debian
Release mdadm-3.3.2
Minor bugfix/stability release.
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -270,13 +270,6 @@ static int read_and_act(struct active_array *a) a->info.resync_start ); - if (a->curr_state > inactive && - a->prev_state == inactive) { - /* array has been started - * possible that container operation has to be completed - */ - a->container->ss->set_array_state(a, 0); - } if ((a->curr_state == bad_word || a->curr_state <= inactive) && a->prev_state > inactive) { /* array has been stopped */ @@ -428,8 +421,7 @@ static int read_and_act(struct active_array *a) if (sync_completed > a->last_checkpoint) a->last_checkpoint = sync_completed; - if (deactivate || a->curr_state >= clean) - a->container->ss->sync_metadata(a->container); + a->container->ss->sync_metadata(a->container); dprintf("%s(%d): state:%s action:%s next(", __func__, a->info.container_member, array_states[a->curr_state], sync_actions[a->curr_action]); |