From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750790AbWHXHlE (ORCPT ); Thu, 24 Aug 2006 03:41:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750772AbWHXHlE (ORCPT ); Thu, 24 Aug 2006 03:41:04 -0400 Received: from mx1.suse.de ([195.135.220.2]:34772 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S1750766AbWHXHlB (ORCPT ); Thu, 24 Aug 2006 03:41:01 -0400 From: NeilBrown To: Andrew Morton Date: Thu, 24 Aug 2006 17:41:01 +1000 Message-Id: <1060824074101.19135@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 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: Neil Brown ### Diffstat output ./drivers/md/raid1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff .prev/drivers/md/raid1.c ./drivers/md/raid1.c --- .prev/drivers/md/raid1.c 2006-08-24 17:09:42.000000000 +1000 +++ ./drivers/md/raid1.c 2006-08-24 17:21:35.000000000 +1000 @@ -1644,15 +1644,16 @@ static sector_t sync_request(mddev_t *md 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 */