From 6ec19cbc39efdbc1e95678f8061e8e66a3ad3dc9 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 25 Feb 2009 13:18:47 +1100 Subject: [PATCH] --- yaml --- r: 131753 b: refs/heads/master c: 78200d45cde2a79c0d0ae0407883bb264caa3c18 h: refs/heads/master i: 131751: 6a40d328e4b572d5c92a1ba5f9f278dde245377b v: v3 --- [refs] | 2 +- trunk/drivers/md/raid10.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4bf9810ee983..3d43323eec0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09b4068a7fe442efc40e9dcbcf5ff37c3338ab15 +refs/heads/master: 78200d45cde2a79c0d0ae0407883bb264caa3c18 diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 118f89e716ea..e1feb87afc6c 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -1749,8 +1749,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i if (!go_faster && conf->nr_waiting) msleep_interruptible(1000); - bitmap_cond_end_sync(mddev->bitmap, sector_nr); - /* Again, very different code for resync and recovery. * Both must result in an r10bio with a list of bios that * have bi_end_io, bi_sector, bi_bdev set, @@ -1886,6 +1884,8 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i /* resync. Schedule a read for every block at this virt offset */ int count = 0; + bitmap_cond_end_sync(mddev->bitmap, sector_nr); + if (!bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, mddev->degraded) && !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {