Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5ab28a3 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: fix problem with raid6 intent bitmap 



When doing a recovery, we need to know whether the array will still be
degraded after the recovery has finished, so we can know whether bits can be
clearred yet or not.  This patch performs the required check.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 700e432d

drivers/md/raid6main.c

+13 −2
Original line number Diff line number Diff line
@@ -1702,6 +1702,8 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 
	int data_disks = raid_disks - 2;

	sector_t max_sector = mddev->size << 1;

	int sync_blocks;

	int still_degraded = 0;

	int i;



	if (sector_nr >= max_sector) {

		/* just being told to finish up .. nothing much to do */
@@ -1710,7 +1712,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 
		if (mddev->curr_resync < max_sector) /* aborted */

			bitmap_end_sync(mddev->bitmap, mddev->curr_resync,

					&sync_blocks, 1);

		else /* compelted sync */

		else /* completed sync */

			conf->fullsync = 0;

		bitmap_close_sync(mddev->bitmap);
@@ -1748,7 +1750,16 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 
		 */

		schedule_timeout_uninterruptible(1);

	}

	bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0);

	/* Need to check if array will still be degraded after recovery/resync

	 * We don't need to check the 'failed' flag as when that gets set,

	 * recovery aborts.

	 */

	for (i=0; i<mddev->raid_disks; i++)

		if (conf->disks[i].rdev == NULL)

			still_degraded = 1;



	bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, still_degraded);



	spin_lock(&sh->lock);

	set_bit(STRIPE_SYNCING, &sh->state);

	clear_bit(STRIPE_INSYNC, &sh->state);