diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 0172bdd37b48..962c8f40908f 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -3985,12 +3985,10 @@ static void make_request(struct mddev *mddev, struct bio * bi) | |||
3985 | plugged = mddev_check_plugged(mddev); | 3985 | plugged = mddev_check_plugged(mddev); |
3986 | for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) { | 3986 | for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) { |
3987 | DEFINE_WAIT(w); | 3987 | DEFINE_WAIT(w); |
3988 | int disks, data_disks; | ||
3989 | int previous; | 3988 | int previous; |
3990 | 3989 | ||
3991 | retry: | 3990 | retry: |
3992 | previous = 0; | 3991 | previous = 0; |
3993 | disks = conf->raid_disks; | ||
3994 | prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE); | 3992 | prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE); |
3995 | if (unlikely(conf->reshape_progress != MaxSector)) { | 3993 | if (unlikely(conf->reshape_progress != MaxSector)) { |
3996 | /* spinlock is needed as reshape_progress may be | 3994 | /* spinlock is needed as reshape_progress may be |
@@ -4005,7 +4003,6 @@ static void make_request(struct mddev *mddev, struct bio * bi) | |||
4005 | if (mddev->reshape_backwards | 4003 | if (mddev->reshape_backwards |
4006 | ? logical_sector < conf->reshape_progress | 4004 | ? logical_sector < conf->reshape_progress |
4007 | : logical_sector >= conf->reshape_progress) { | 4005 | : logical_sector >= conf->reshape_progress) { |
4008 | disks = conf->previous_raid_disks; | ||
4009 | previous = 1; | 4006 | previous = 1; |
4010 | } else { | 4007 | } else { |
4011 | if (mddev->reshape_backwards | 4008 | if (mddev->reshape_backwards |
@@ -4018,7 +4015,6 @@ static void make_request(struct mddev *mddev, struct bio * bi) | |||
4018 | } | 4015 | } |
4019 | spin_unlock_irq(&conf->device_lock); | 4016 | spin_unlock_irq(&conf->device_lock); |
4020 | } | 4017 | } |
4021 | data_disks = disks - conf->max_degraded; | ||
4022 | 4018 | ||
4023 | new_sector = raid5_compute_sector(conf, logical_sector, | 4019 | new_sector = raid5_compute_sector(conf, logical_sector, |
4024 | previous, | 4020 | previous, |