diff options
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 00c78b77b13d..650991bddd8e 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -552,7 +552,7 @@ static void unplug_slaves(mddev_t *mddev) | |||
552 | for (i=0; i<mddev->raid_disks; i++) { | 552 | for (i=0; i<mddev->raid_disks; i++) { |
553 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 553 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
554 | if (rdev && !test_bit(Faulty, &rdev->flags) && atomic_read(&rdev->nr_pending)) { | 554 | if (rdev && !test_bit(Faulty, &rdev->flags) && atomic_read(&rdev->nr_pending)) { |
555 | request_queue_t *r_queue = bdev_get_queue(rdev->bdev); | 555 | struct request_queue *r_queue = bdev_get_queue(rdev->bdev); |
556 | 556 | ||
557 | atomic_inc(&rdev->nr_pending); | 557 | atomic_inc(&rdev->nr_pending); |
558 | rcu_read_unlock(); | 558 | rcu_read_unlock(); |
@@ -567,7 +567,7 @@ static void unplug_slaves(mddev_t *mddev) | |||
567 | rcu_read_unlock(); | 567 | rcu_read_unlock(); |
568 | } | 568 | } |
569 | 569 | ||
570 | static void raid1_unplug(request_queue_t *q) | 570 | static void raid1_unplug(struct request_queue *q) |
571 | { | 571 | { |
572 | mddev_t *mddev = q->queuedata; | 572 | mddev_t *mddev = q->queuedata; |
573 | 573 | ||
@@ -575,7 +575,7 @@ static void raid1_unplug(request_queue_t *q) | |||
575 | md_wakeup_thread(mddev->thread); | 575 | md_wakeup_thread(mddev->thread); |
576 | } | 576 | } |
577 | 577 | ||
578 | static int raid1_issue_flush(request_queue_t *q, struct gendisk *disk, | 578 | static int raid1_issue_flush(struct request_queue *q, struct gendisk *disk, |
579 | sector_t *error_sector) | 579 | sector_t *error_sector) |
580 | { | 580 | { |
581 | mddev_t *mddev = q->queuedata; | 581 | mddev_t *mddev = q->queuedata; |
@@ -587,7 +587,7 @@ static int raid1_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
587 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 587 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
588 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 588 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
589 | struct block_device *bdev = rdev->bdev; | 589 | struct block_device *bdev = rdev->bdev; |
590 | request_queue_t *r_queue = bdev_get_queue(bdev); | 590 | struct request_queue *r_queue = bdev_get_queue(bdev); |
591 | 591 | ||
592 | if (!r_queue->issue_flush_fn) | 592 | if (!r_queue->issue_flush_fn) |
593 | ret = -EOPNOTSUPP; | 593 | ret = -EOPNOTSUPP; |
@@ -615,7 +615,7 @@ static int raid1_congested(void *data, int bits) | |||
615 | for (i = 0; i < mddev->raid_disks; i++) { | 615 | for (i = 0; i < mddev->raid_disks; i++) { |
616 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 616 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
617 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 617 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
618 | request_queue_t *q = bdev_get_queue(rdev->bdev); | 618 | struct request_queue *q = bdev_get_queue(rdev->bdev); |
619 | 619 | ||
620 | /* Note the '|| 1' - when read_balance prefers | 620 | /* Note the '|| 1' - when read_balance prefers |
621 | * non-congested targets, it can be removed | 621 | * non-congested targets, it can be removed |
@@ -765,7 +765,7 @@ do_sync_io: | |||
765 | return NULL; | 765 | return NULL; |
766 | } | 766 | } |
767 | 767 | ||
768 | static int make_request(request_queue_t *q, struct bio * bio) | 768 | static int make_request(struct request_queue *q, struct bio * bio) |
769 | { | 769 | { |
770 | mddev_t *mddev = q->queuedata; | 770 | mddev_t *mddev = q->queuedata; |
771 | conf_t *conf = mddev_to_conf(mddev); | 771 | conf_t *conf = mddev_to_conf(mddev); |