diff --git a/[refs] b/[refs] index a1b2adf554a4..d2d7c690b21b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a42f9d83b5c05dc6e678a1f0cd9767502c2c58de +refs/heads/master: c6d2e084c7411f61f2b446d94989e5aaf9879b0f diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 9799be80bf31..f351422938e0 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -3279,12 +3279,14 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) /* If there is a failed device being replaced, * we must be recovering. * else if we are after recovery_cp, we must be syncing + * else if MD_RECOVERY_REQUESTED is set, we also are syncing. * else we can only be replacing * sync and recovery both need to read all devices, and so * use the same flag. */ if (do_recovery || - sh->sector >= conf->mddev->recovery_cp) + sh->sector >= conf->mddev->recovery_cp || + test_bit(MD_RECOVERY_REQUESTED, &(conf->mddev->recovery))) s->syncing = 1; else s->replacing = 1;