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.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 697f026cb318..5af2d2709081 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -184,8 +184,6 @@ static void return_io(struct bio *return_bi)
184 return_bi = bi->bi_next; 184 return_bi = bi->bi_next;
185 bi->bi_next = NULL; 185 bi->bi_next = NULL;
186 bi->bi_size = 0; 186 bi->bi_size = 0;
187 trace_block_bio_complete(bdev_get_queue(bi->bi_bdev),
188 bi, 0);
189 bio_endio(bi, 0); 187 bio_endio(bi, 0);
190 bi = return_bi; 188 bi = return_bi;
191 } 189 }
@@ -3916,8 +3914,6 @@ static void raid5_align_endio(struct bio *bi, int error)
3916 rdev_dec_pending(rdev, conf->mddev); 3914 rdev_dec_pending(rdev, conf->mddev);
3917 3915
3918 if (!error && uptodate) { 3916 if (!error && uptodate) {
3919 trace_block_bio_complete(bdev_get_queue(raid_bi->bi_bdev),
3920 raid_bi, 0);
3921 bio_endio(raid_bi, 0); 3917 bio_endio(raid_bi, 0);
3922 if (atomic_dec_and_test(&conf->active_aligned_reads)) 3918 if (atomic_dec_and_test(&conf->active_aligned_reads))
3923 wake_up(&conf->wait_for_stripe); 3919 wake_up(&conf->wait_for_stripe);
@@ -4376,8 +4372,6 @@ static void make_request(struct mddev *mddev, struct bio * bi)
4376 if ( rw == WRITE ) 4372 if ( rw == WRITE )
4377 md_write_end(mddev); 4373 md_write_end(mddev);
4378 4374
4379 trace_block_bio_complete(bdev_get_queue(bi->bi_bdev),
4380 bi, 0);
4381 bio_endio(bi, 0); 4375 bio_endio(bi, 0);
4382 } 4376 }
4383} 4377}
@@ -4754,11 +4748,8 @@ static int retry_aligned_read(struct r5conf *conf, struct bio *raid_bio)
4754 handled++; 4748 handled++;
4755 } 4749 }
4756 remaining = raid5_dec_bi_active_stripes(raid_bio); 4750 remaining = raid5_dec_bi_active_stripes(raid_bio);
4757 if (remaining == 0) { 4751 if (remaining == 0)
4758 trace_block_bio_complete(bdev_get_queue(raid_bio->bi_bdev),
4759 raid_bio, 0);
4760 bio_endio(raid_bio, 0); 4752 bio_endio(raid_bio, 0);
4761 }
4762 if (atomic_dec_and_test(&conf->active_aligned_reads)) 4753 if (atomic_dec_and_test(&conf->active_aligned_reads))
4763 wake_up(&conf->wait_for_stripe); 4754 wake_up(&conf->wait_for_stripe);
4764 return handled; 4755 return handled;