diff options
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index eac84d8ff724..2089d46b0eb8 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -3887,10 +3887,10 @@ array_state_show(struct mddev *mddev, char *page) | |||
3887 | st = read_auto; | 3887 | st = read_auto; |
3888 | break; | 3888 | break; |
3889 | case 0: | 3889 | case 0: |
3890 | if (mddev->in_sync) | 3890 | if (test_bit(MD_CHANGE_PENDING, &mddev->flags)) |
3891 | st = clean; | ||
3892 | else if (test_bit(MD_CHANGE_PENDING, &mddev->flags)) | ||
3893 | st = write_pending; | 3891 | st = write_pending; |
3892 | else if (mddev->in_sync) | ||
3893 | st = clean; | ||
3894 | else if (mddev->safemode) | 3894 | else if (mddev->safemode) |
3895 | st = active_idle; | 3895 | st = active_idle; |
3896 | else | 3896 | else |
@@ -8144,14 +8144,14 @@ void md_do_sync(struct md_thread *thread) | |||
8144 | 8144 | ||
8145 | if (!test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && | 8145 | if (!test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && |
8146 | !test_bit(MD_RECOVERY_INTR, &mddev->recovery) && | 8146 | !test_bit(MD_RECOVERY_INTR, &mddev->recovery) && |
8147 | mddev->curr_resync > 2) { | 8147 | mddev->curr_resync > 3) { |
8148 | mddev->curr_resync_completed = mddev->curr_resync; | 8148 | mddev->curr_resync_completed = mddev->curr_resync; |
8149 | sysfs_notify(&mddev->kobj, NULL, "sync_completed"); | 8149 | sysfs_notify(&mddev->kobj, NULL, "sync_completed"); |
8150 | } | 8150 | } |
8151 | mddev->pers->sync_request(mddev, max_sectors, &skipped); | 8151 | mddev->pers->sync_request(mddev, max_sectors, &skipped); |
8152 | 8152 | ||
8153 | if (!test_bit(MD_RECOVERY_CHECK, &mddev->recovery) && | 8153 | if (!test_bit(MD_RECOVERY_CHECK, &mddev->recovery) && |
8154 | mddev->curr_resync > 2) { | 8154 | mddev->curr_resync > 3) { |
8155 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) { | 8155 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) { |
8156 | if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { | 8156 | if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { |
8157 | if (mddev->curr_resync >= mddev->recovery_cp) { | 8157 | if (mddev->curr_resync >= mddev->recovery_cp) { |