diff options
| -rw-r--r-- | drivers/md/raid10.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 3480bf7c20d4..cd066b63bdaf 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -2931,14 +2931,13 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, | |||
| 2931 | */ | 2931 | */ |
| 2932 | if (mddev->bitmap == NULL && | 2932 | if (mddev->bitmap == NULL && |
| 2933 | mddev->recovery_cp == MaxSector && | 2933 | mddev->recovery_cp == MaxSector && |
| 2934 | mddev->reshape_position == MaxSector && | ||
| 2935 | !test_bit(MD_RECOVERY_SYNC, &mddev->recovery) && | ||
| 2934 | !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) && | 2936 | !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) && |
| 2937 | !test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && | ||
| 2935 | conf->fullsync == 0) { | 2938 | conf->fullsync == 0) { |
| 2936 | *skipped = 1; | 2939 | *skipped = 1; |
| 2937 | max_sector = mddev->dev_sectors; | 2940 | return mddev->dev_sectors - sector_nr; |
| 2938 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || | ||
| 2939 | test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) | ||
| 2940 | max_sector = mddev->resync_max_sectors; | ||
| 2941 | return max_sector - sector_nr; | ||
| 2942 | } | 2941 | } |
| 2943 | 2942 | ||
| 2944 | skipped: | 2943 | skipped: |
