|
@@ -2423,10 +2423,10 @@ static void raid5_end_read_request(struct bio * bi)
|
|
|
}
|
|
|
}
|
|
|
rdev_dec_pending(rdev, conf->mddev);
|
|
|
+ bio_reset(bi);
|
|
|
clear_bit(R5_LOCKED, &sh->dev[i].flags);
|
|
|
set_bit(STRIPE_HANDLE, &sh->state);
|
|
|
raid5_release_stripe(sh);
|
|
|
- bio_reset(bi);
|
|
|
}
|
|
|
|
|
|
static void raid5_end_write_request(struct bio *bi)
|
|
@@ -2498,6 +2498,7 @@ static void raid5_end_write_request(struct bio *bi)
|
|
|
if (sh->batch_head && bi->bi_error && !replacement)
|
|
|
set_bit(STRIPE_BATCH_ERR, &sh->batch_head->state);
|
|
|
|
|
|
+ bio_reset(bi);
|
|
|
if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags))
|
|
|
clear_bit(R5_LOCKED, &sh->dev[i].flags);
|
|
|
set_bit(STRIPE_HANDLE, &sh->state);
|
|
@@ -2505,7 +2506,6 @@ static void raid5_end_write_request(struct bio *bi)
|
|
|
|
|
|
if (sh->batch_head && sh != sh->batch_head)
|
|
|
raid5_release_stripe(sh->batch_head);
|
|
|
- bio_reset(bi);
|
|
|
}
|
|
|
|
|
|
static void raid5_build_block(struct stripe_head *sh, int i, int previous)
|