Commit 6b1117d5 authored Mar 31, 2006 by NeilBrown Committed by Linus Torvalds Mar 31, 2006

[PATCH] md: Don't clear bits in bitmap when writing to one device fails during recovery



Currently a device failure during recovery leaves bits set in the bitmap.
This normally isn't a problem as the offending device will be rejected because
of errors.  However if device re-adding is being used with non-persistent
bitmaps, this can be a problem.

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

parent 39451a73

drivers/md/raid1.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -1135,8 +1135,19 @@ static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)
		mirror = i;
		break;
		}
		if (!uptodate)
		if (!uptodate) {
		int sync_blocks = 0;
		sector_t s = r1_bio->sector;
		long sectors_to_go = r1_bio->sectors;
		/* make sure these bits doesn't get cleared. */
		do {
		bitmap_end_sync(mddev->bitmap, r1_bio->sector,
		&sync_blocks, 1);
		s += sync_blocks;
		sectors_to_go -= sync_blocks;
		} while (sectors_to_go > 0);
		md_error(mddev, conf->mirrors[mirror].rdev);
		}

		update_head_pos(mirror, r1_bio);