From: Neil Brown Date: Sat, 11 Aug 2007 22:17:07 +0000 (+0200) Subject: md: Don't clear bits in bitmap when writing to one device fails during recovery X-Git-Tag: v2.6.16.54-rc1~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da6843b983e8bebefa78f15e433320c56c27477;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Adrian Bunk --- diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 31e872eb0b923..0a01a0cbd88a2 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1138,8 +1138,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);