[PATCH v3 2/8] raid5: directly use mddev->queue
From: Shaohua Li <hidden>
Date: 2015-06-03 22:48:37
Subsystem:
software raid (multiple disks) support, the rest · Maintainers:
Song Liu, Yu Kuai, Linus Torvalds
When the cache layer flushes data from cache disk to raid disks, it will dipsatch IO to raid disks. At that time, we don't have a block device attached to the bio, so directly use mddev->queue. That should not impact IO dispatched to rdev, which has rdev block device attached. Signed-off-by: Shaohua Li <redacted> --- drivers/md/raid5.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 553d54b..4c122ad 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c@@ -223,7 +223,7 @@ static int raid6_idx_to_slot(int idx, struct stripe_head *sh, return slot; } -static void return_io(struct bio *return_bi) +static void return_io(struct r5conf *conf, struct bio *return_bi) { struct bio *bi = return_bi; while (bi) {
@@ -231,8 +231,7 @@ static void return_io(struct bio *return_bi) return_bi = bi->bi_next; bi->bi_next = NULL; bi->bi_iter.bi_size = 0; - trace_block_bio_complete(bdev_get_queue(bi->bi_bdev), - bi, 0); + trace_block_bio_complete(conf->mddev->queue, bi, 0); bio_endio(bi, 0); bi = return_bi; }
@@ -1200,7 +1199,7 @@ static void ops_complete_biofill(void *stripe_head_ref) } clear_bit(STRIPE_BIOFILL_RUN, &sh->state); - return_io(return_bi); + return_io(sh->raid_conf, return_bi); set_bit(STRIPE_HANDLE, &sh->state); release_stripe(sh);
@@ -4594,7 +4593,7 @@ static void handle_stripe(struct stripe_head *sh) md_wakeup_thread(conf->mddev->thread); } - return_io(s.return_bi); + return_io(conf, s.return_bi); clear_bit_unlock(STRIPE_ACTIVE, &sh->state); }
@@ -5298,8 +5297,7 @@ static void make_request(struct mddev *mddev, struct bio * bi) if ( rw == WRITE ) md_write_end(mddev); - trace_block_bio_complete(bdev_get_queue(bi->bi_bdev), - bi, 0); + trace_block_bio_complete(mddev->queue, bi, 0); bio_endio(bi, 0); } }
--
1.8.1