aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 231afda1697f..2882a26646fd 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3753,9 +3753,8 @@ static int bio_fits_rdev(struct bio *bi)
3753} 3753}
3754 3754
3755 3755
3756static int chunk_aligned_read(struct request_queue *q, struct bio * raid_bio) 3756static int chunk_aligned_read(mddev_t *mddev, struct bio * raid_bio)
3757{ 3757{
3758 mddev_t *mddev = q->queuedata;
3759 raid5_conf_t *conf = mddev->private; 3758 raid5_conf_t *conf = mddev->private;
3760 int dd_idx; 3759 int dd_idx;
3761 struct bio* align_bi; 3760 struct bio* align_bi;
@@ -3870,9 +3869,8 @@ static struct stripe_head *__get_priority_stripe(raid5_conf_t *conf)
3870 return sh; 3869 return sh;
3871} 3870}
3872 3871
3873static int make_request(struct request_queue *q, struct bio * bi) 3872static int make_request(mddev_t *mddev, struct bio * bi)
3874{ 3873{
3875 mddev_t *mddev = q->queuedata;
3876 raid5_conf_t *conf = mddev->private; 3874 raid5_conf_t *conf = mddev->private;
3877 int dd_idx; 3875 int dd_idx;
3878 sector_t new_sector; 3876 sector_t new_sector;
@@ -3896,7 +3894,7 @@ static int make_request(struct request_queue *q, struct bio * bi)
3896 3894
3897 if (rw == READ && 3895 if (rw == READ &&
3898 mddev->reshape_position == MaxSector && 3896 mddev->reshape_position == MaxSector &&
3899 chunk_aligned_read(q,bi)) 3897 chunk_aligned_read(mddev,bi))
3900 return 0; 3898 return 0;
3901 3899
3902 logical_sector = bi->bi_sector & ~((sector_t)STRIPE_SECTORS-1); 3900 logical_sector = bi->bi_sector & ~((sector_t)STRIPE_SECTORS-1);