diff options
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r-- | drivers/md/raid10.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index a95ada1cfac4..f730a144baf1 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -453,7 +453,7 @@ static sector_t raid10_find_virt(conf_t *conf, sector_t sector, int dev) | |||
453 | * If near_copies == raid_disk, there are no striping issues, | 453 | * If near_copies == raid_disk, there are no striping issues, |
454 | * but in that case, the function isn't called at all. | 454 | * but in that case, the function isn't called at all. |
455 | */ | 455 | */ |
456 | static int raid10_mergeable_bvec(request_queue_t *q, struct bio *bio, | 456 | static int raid10_mergeable_bvec(struct request_queue *q, struct bio *bio, |
457 | struct bio_vec *bio_vec) | 457 | struct bio_vec *bio_vec) |
458 | { | 458 | { |
459 | mddev_t *mddev = q->queuedata; | 459 | mddev_t *mddev = q->queuedata; |
@@ -595,7 +595,7 @@ static void unplug_slaves(mddev_t *mddev) | |||
595 | for (i=0; i<mddev->raid_disks; i++) { | 595 | for (i=0; i<mddev->raid_disks; i++) { |
596 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 596 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
597 | if (rdev && !test_bit(Faulty, &rdev->flags) && atomic_read(&rdev->nr_pending)) { | 597 | if (rdev && !test_bit(Faulty, &rdev->flags) && atomic_read(&rdev->nr_pending)) { |
598 | request_queue_t *r_queue = bdev_get_queue(rdev->bdev); | 598 | struct request_queue *r_queue = bdev_get_queue(rdev->bdev); |
599 | 599 | ||
600 | atomic_inc(&rdev->nr_pending); | 600 | atomic_inc(&rdev->nr_pending); |
601 | rcu_read_unlock(); | 601 | rcu_read_unlock(); |
@@ -610,7 +610,7 @@ static void unplug_slaves(mddev_t *mddev) | |||
610 | rcu_read_unlock(); | 610 | rcu_read_unlock(); |
611 | } | 611 | } |
612 | 612 | ||
613 | static void raid10_unplug(request_queue_t *q) | 613 | static void raid10_unplug(struct request_queue *q) |
614 | { | 614 | { |
615 | mddev_t *mddev = q->queuedata; | 615 | mddev_t *mddev = q->queuedata; |
616 | 616 | ||
@@ -618,7 +618,7 @@ static void raid10_unplug(request_queue_t *q) | |||
618 | md_wakeup_thread(mddev->thread); | 618 | md_wakeup_thread(mddev->thread); |
619 | } | 619 | } |
620 | 620 | ||
621 | static int raid10_issue_flush(request_queue_t *q, struct gendisk *disk, | 621 | static int raid10_issue_flush(struct request_queue *q, struct gendisk *disk, |
622 | sector_t *error_sector) | 622 | sector_t *error_sector) |
623 | { | 623 | { |
624 | mddev_t *mddev = q->queuedata; | 624 | mddev_t *mddev = q->queuedata; |
@@ -630,7 +630,7 @@ static int raid10_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
630 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 630 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
631 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 631 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
632 | struct block_device *bdev = rdev->bdev; | 632 | struct block_device *bdev = rdev->bdev; |
633 | request_queue_t *r_queue = bdev_get_queue(bdev); | 633 | struct request_queue *r_queue = bdev_get_queue(bdev); |
634 | 634 | ||
635 | if (!r_queue->issue_flush_fn) | 635 | if (!r_queue->issue_flush_fn) |
636 | ret = -EOPNOTSUPP; | 636 | ret = -EOPNOTSUPP; |
@@ -658,7 +658,7 @@ static int raid10_congested(void *data, int bits) | |||
658 | for (i = 0; i < mddev->raid_disks && ret == 0; i++) { | 658 | for (i = 0; i < mddev->raid_disks && ret == 0; i++) { |
659 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); | 659 | mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev); |
660 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 660 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
661 | request_queue_t *q = bdev_get_queue(rdev->bdev); | 661 | struct request_queue *q = bdev_get_queue(rdev->bdev); |
662 | 662 | ||
663 | ret |= bdi_congested(&q->backing_dev_info, bits); | 663 | ret |= bdi_congested(&q->backing_dev_info, bits); |
664 | } | 664 | } |
@@ -772,7 +772,7 @@ static void unfreeze_array(conf_t *conf) | |||
772 | spin_unlock_irq(&conf->resync_lock); | 772 | spin_unlock_irq(&conf->resync_lock); |
773 | } | 773 | } |
774 | 774 | ||
775 | static int make_request(request_queue_t *q, struct bio * bio) | 775 | static int make_request(struct request_queue *q, struct bio * bio) |
776 | { | 776 | { |
777 | mddev_t *mddev = q->queuedata; | 777 | mddev_t *mddev = q->queuedata; |
778 | conf_t *conf = mddev_to_conf(mddev); | 778 | conf_t *conf = mddev_to_conf(mddev); |