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

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

[PATCH] md: fix recent breakage of md/raid1 array checking 



A recent patch broke the ability to do a user-request check of a raid1.
This patch fixes the breakage and also moves a comment that was dislocated
by the same patch.

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 84692195

drivers/md/raid1.c

+4 −3
Original line number Diff line number Diff line
@@ -1625,15 +1625,16 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 
		return 0;

	}



	/* before building a request, check if we can skip these blocks..

	 * This call the bitmap_start_sync doesn't actually record anything

	 */

	if (mddev->bitmap == NULL &&

	    mddev->recovery_cp == MaxSector &&

	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) &&

	    conf->fullsync == 0) {

		*skipped = 1;

		return max_sector - sector_nr;

	}

	/* before building a request, check if we can skip these blocks..

	 * This call the bitmap_start_sync doesn't actually record anything

	 */

	if (!bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&

	    !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {

		/* We can skip this block, and probably several more */