From: NeilBrown <neilb@suse.de>
Date: Wed, 9 Nov 2005 05:39:38 +0000 (-0800)
Subject: [PATCH] md: make sure a user-request sync of raid5 ignores intent bitmap
X-Git-Tag: v2.6.15-rc1~82
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3855ad9f398de88a3290f7dd799633c4b73903ea;p=linux-2.6-omap-h63xx.git

[PATCH] md: make sure a user-request sync of raid5 ignores intent bitmap

A sync of raid5 usually ignore blocks which the bitmap says are in-sync.  But
a user-request check or repair should not ignore these.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index d1c488b008a..51003b008de 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1645,6 +1645,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 		return rv;
 	}
 	if (!bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&
+	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) &&
 	    !conf->fullsync && sync_blocks >= STRIPE_SECTORS) {
 		/* we can skip this block, and probably more */
 		sync_blocks /= STRIPE_SECTORS;