aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/raid5.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 9de8221f64ec..ab613efbbead 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2507,10 +2507,8 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
2507 bi = sh->dev[i].towrite; 2507 bi = sh->dev[i].towrite;
2508 sh->dev[i].towrite = NULL; 2508 sh->dev[i].towrite = NULL;
2509 spin_unlock_irq(&sh->stripe_lock); 2509 spin_unlock_irq(&sh->stripe_lock);
2510 if (bi) { 2510 if (bi)
2511 s->to_write--;
2512 bitmap_end = 1; 2511 bitmap_end = 1;
2513 }
2514 2512
2515 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags)) 2513 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
2516 wake_up(&conf->wait_for_overlap); 2514 wake_up(&conf->wait_for_overlap);
@@ -2558,7 +2556,6 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
2558 spin_unlock_irq(&sh->stripe_lock); 2556 spin_unlock_irq(&sh->stripe_lock);
2559 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags)) 2557 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
2560 wake_up(&conf->wait_for_overlap); 2558 wake_up(&conf->wait_for_overlap);
2561 if (bi) s->to_read--;
2562 while (bi && bi->bi_sector < 2559 while (bi && bi->bi_sector <
2563 sh->dev[i].sector + STRIPE_SECTORS) { 2560 sh->dev[i].sector + STRIPE_SECTORS) {
2564 struct bio *nextbi = 2561 struct bio *nextbi =