diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 19d77a026639..9ab506df42da 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 | } |
@@ -3917,8 +3915,6 @@ static void raid5_align_endio(struct bio *bi, int error) | |||
3917 | rdev_dec_pending(rdev, conf->mddev); | 3915 | rdev_dec_pending(rdev, conf->mddev); |
3918 | 3916 | ||
3919 | if (!error && uptodate) { | 3917 | if (!error && uptodate) { |
3920 | trace_block_bio_complete(bdev_get_queue(raid_bi->bi_bdev), | ||
3921 | raid_bi, 0); | ||
3922 | bio_endio(raid_bi, 0); | 3918 | bio_endio(raid_bi, 0); |
3923 | if (atomic_dec_and_test(&conf->active_aligned_reads)) | 3919 | if (atomic_dec_and_test(&conf->active_aligned_reads)) |
3924 | wake_up(&conf->wait_for_stripe); | 3920 | wake_up(&conf->wait_for_stripe); |
@@ -4377,8 +4373,6 @@ static void make_request(struct mddev *mddev, struct bio * bi) | |||
4377 | if ( rw == WRITE ) | 4373 | if ( rw == WRITE ) |
4378 | md_write_end(mddev); | 4374 | md_write_end(mddev); |
4379 | 4375 | ||
4380 | trace_block_bio_complete(bdev_get_queue(bi->bi_bdev), | ||
4381 | bi, 0); | ||
4382 | bio_endio(bi, 0); | 4376 | bio_endio(bi, 0); |
4383 | } | 4377 | } |
4384 | } | 4378 | } |
@@ -4755,11 +4749,8 @@ static int retry_aligned_read(struct r5conf *conf, struct bio *raid_bio) | |||
4755 | handled++; | 4749 | handled++; |
4756 | } | 4750 | } |
4757 | remaining = raid5_dec_bi_active_stripes(raid_bio); | 4751 | remaining = raid5_dec_bi_active_stripes(raid_bio); |
4758 | if (remaining == 0) { | 4752 | if (remaining == 0) |
4759 | trace_block_bio_complete(bdev_get_queue(raid_bio->bi_bdev), | ||
4760 | raid_bio, 0); | ||
4761 | bio_endio(raid_bio, 0); | 4753 | bio_endio(raid_bio, 0); |
4762 | } | ||
4763 | if (atomic_dec_and_test(&conf->active_aligned_reads)) | 4754 | if (atomic_dec_and_test(&conf->active_aligned_reads)) |
4764 | wake_up(&conf->wait_for_stripe); | 4755 | wake_up(&conf->wait_for_stripe); |
4765 | return handled; | 4756 | return handled; |