From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751088AbWC3Fyp (ORCPT ); Thu, 30 Mar 2006 00:54:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751085AbWC3Fy1 (ORCPT ); Thu, 30 Mar 2006 00:54:27 -0500 Received: from ns2.suse.de ([195.135.220.15]:12448 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S1751084AbWC3FyX (ORCPT ); Thu, 30 Mar 2006 00:54:23 -0500 From: NeilBrown To: Andrew Morton Date: Thu, 30 Mar 2006 16:52:37 +1100 Message-Id: <1060330055237.25270@suse.de> X-face: [Gw_3E*Gng}4rRrKRYotwlE?.2|**#s9D Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 ### Diffstat output ./drivers/md/raid1.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff ./drivers/md/raid1.c~current~ ./drivers/md/raid1.c --- ./drivers/md/raid1.c~current~ 2006-03-30 16:48:29.000000000 +1100 +++ ./drivers/md/raid1.c 2006-03-30 16:48:40.000000000 +1100 @@ -1135,8 +1135,19 @@ static int end_sync_write(struct bio *bi 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);