diff options
author | NeilBrown <neilb@suse.de> | 2010-04-01 00:02:13 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-05-18 01:27:55 -0400 |
commit | 21a52c6d05c15f862797736393915bfa8cd40ee9 (patch) | |
tree | 44ffb633d209457979177a52132761a368fcb976 /drivers/md/md.c | |
parent | cca9cf90c504d98644ace52c474770970729f0eb (diff) |
md: pass mddev to make_request functions rather than request_queue
We used to pass the personality make_request function direct
to the block layer so the first argument had to be a queue.
But now we have the intermediary md_make_request so it makes
at lot more sense to pass a struct mddev_s.
It makes it possible to have an mddev without its own queue too.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index f48ba419cd7b..2e05b0c2515d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -240,7 +240,7 @@ static int md_make_request(struct request_queue *q, struct bio *bio) | |||
240 | atomic_inc(&mddev->active_io); | 240 | atomic_inc(&mddev->active_io); |
241 | rcu_read_unlock(); | 241 | rcu_read_unlock(); |
242 | 242 | ||
243 | rv = mddev->pers->make_request(q, bio); | 243 | rv = mddev->pers->make_request(mddev, bio); |
244 | 244 | ||
245 | cpu = part_stat_lock(); | 245 | cpu = part_stat_lock(); |
246 | part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]); | 246 | part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]); |
@@ -354,7 +354,7 @@ static void md_submit_barrier(struct work_struct *ws) | |||
354 | bio_endio(bio, 0); | 354 | bio_endio(bio, 0); |
355 | else { | 355 | else { |
356 | bio->bi_rw &= ~(1<<BIO_RW_BARRIER); | 356 | bio->bi_rw &= ~(1<<BIO_RW_BARRIER); |
357 | if (mddev->pers->make_request(mddev->queue, bio)) | 357 | if (mddev->pers->make_request(mddev, bio)) |
358 | generic_make_request(bio); | 358 | generic_make_request(bio); |
359 | mddev->barrier = POST_REQUEST_BARRIER; | 359 | mddev->barrier = POST_REQUEST_BARRIER; |
360 | submit_barriers(mddev); | 360 | submit_barriers(mddev); |