diff options
| -rw-r--r-- | drivers/md/raid10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 118f89e716ea..e1feb87afc6c 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1749,8 +1749,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i | |||
| 1749 | if (!go_faster && conf->nr_waiting) | 1749 | if (!go_faster && conf->nr_waiting) |
| 1750 | msleep_interruptible(1000); | 1750 | msleep_interruptible(1000); |
| 1751 | 1751 | ||
| 1752 | bitmap_cond_end_sync(mddev->bitmap, sector_nr); | ||
| 1753 | |||
| 1754 | /* Again, very different code for resync and recovery. | 1752 | /* Again, very different code for resync and recovery. |
| 1755 | * Both must result in an r10bio with a list of bios that | 1753 | * Both must result in an r10bio with a list of bios that |
| 1756 | * have bi_end_io, bi_sector, bi_bdev set, | 1754 | * 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 | |||
| 1886 | /* resync. Schedule a read for every block at this virt offset */ | 1884 | /* resync. Schedule a read for every block at this virt offset */ |
| 1887 | int count = 0; | 1885 | int count = 0; |
| 1888 | 1886 | ||
| 1887 | bitmap_cond_end_sync(mddev->bitmap, sector_nr); | ||
| 1888 | |||
| 1889 | if (!bitmap_start_sync(mddev->bitmap, sector_nr, | 1889 | if (!bitmap_start_sync(mddev->bitmap, sector_nr, |
| 1890 | &sync_blocks, mddev->degraded) && | 1890 | &sync_blocks, mddev->degraded) && |
| 1891 | !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { | 1891 | !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { |
