From e030b182ebb3f21b3059212f9395a1e1bbfc5b2b Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 21 Jun 2005 17:17:23 -0700 Subject: [PATCH] --- yaml --- r: 2591 b: refs/heads/master c: ab7a30c7051ee32d0d72415fe0a16d60eba38a0d h: refs/heads/master i: 2589: 1604cca174b14cccb1866cbfc2e044e3558484b0 2587: 0cb9c253814fe654eacdfc01ac4ec8244574ddd2 2583: 11e02718799ed2fc3e283aaa95462570696a3fdf 2575: 3db3459ae159b5e9596ff9c93fac3606feda01a3 2559: 6ce3c72ae977dc13ca21318b58b0339b167e8028 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid1.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index edd3a6daa442..a1e5b6389574 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 191ea9b2c7cc3ebbe0678834ab710d7d95ad3f9a +refs/heads/master: ab7a30c7051ee32d0d72415fe0a16d60eba38a0d diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 0fd4c3bfc851..9d9acc3e51a7 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -1237,13 +1237,16 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i len = (max_sector - sector_nr) << 9; if (len == 0) break; - if (!conf->fullsync && sync_blocks == 0) - if (!bitmap_start_sync(mddev->bitmap, - sector_nr, &sync_blocks)) - break; - if (sync_blocks < (PAGE_SIZE>>9)) - BUG(); - if (len > (sync_blocks<<9)) len = sync_blocks<<9; + if (!conf->fullsync) { + if (sync_blocks == 0) { + if (!bitmap_start_sync(mddev->bitmap, + sector_nr, &sync_blocks)) + break; + if (sync_blocks < (PAGE_SIZE>>9)) + BUG(); + if (len > (sync_blocks<<9)) len = sync_blocks<<9; + } + } for (i=0 ; i < conf->raid_disks; i++) { bio = r1_bio->bios[i];