md/raid5: Fix a bug about judging if the operation is syncing or replacing

When create a raid5 using assume-clean and echo check or repair to
sync_action.Then component disks did not operated IO but the raid
check/resync faster than normal.
Because the judgement in function analyse_stripe():
		if (do_recovery ||
		    sh->sector >= conf->mddev->recovery_cp)
			s->syncing = 1;
		else
			s->replacing = 1;
When check or repair,the recovery_cp == MaxSectore,so syncing equal zero
not one.

This bug was introduced by commit 9a3e1101b8
    md/raid5:  detect and handle replacements during recovery.
so this patch is suitable for 3.3-stable.

Cc: stable@vger.kernel.org
Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
majianpeng 2012-04-02 01:16:59 +10:00 коммит произвёл NeilBrown
Родитель a42f9d83b5
Коммит c6d2e084c7
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -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, /* If there is a failed device being replaced,
* we must be recovering. * we must be recovering.
* else if we are after recovery_cp, we must be syncing * 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 * else we can only be replacing
* sync and recovery both need to read all devices, and so * sync and recovery both need to read all devices, and so
* use the same flag. * use the same flag.
*/ */
if (do_recovery || 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; s->syncing = 1;
else else
s->replacing = 1; s->replacing = 1;