diff options
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 192741083196..17f795c3e0ab 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
| @@ -55,7 +55,7 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector) | |||
| 55 | * | 55 | * |
| 56 | * Return amount of bytes we can take at this offset | 56 | * Return amount of bytes we can take at this offset |
| 57 | */ | 57 | */ |
| 58 | static int linear_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *biovec) | 58 | static int linear_mergeable_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *biovec) |
| 59 | { | 59 | { |
| 60 | mddev_t *mddev = q->queuedata; | 60 | mddev_t *mddev = q->queuedata; |
| 61 | dev_info_t *dev0; | 61 | dev_info_t *dev0; |
| @@ -79,20 +79,20 @@ static int linear_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio | |||
| 79 | return maxsectors << 9; | 79 | return maxsectors << 9; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static void linear_unplug(request_queue_t *q) | 82 | static void linear_unplug(struct request_queue *q) |
| 83 | { | 83 | { |
| 84 | mddev_t *mddev = q->queuedata; | 84 | mddev_t *mddev = q->queuedata; |
| 85 | linear_conf_t *conf = mddev_to_conf(mddev); | 85 | linear_conf_t *conf = mddev_to_conf(mddev); |
| 86 | int i; | 86 | int i; |
| 87 | 87 | ||
| 88 | for (i=0; i < mddev->raid_disks; i++) { | 88 | for (i=0; i < mddev->raid_disks; i++) { |
| 89 | request_queue_t *r_queue = bdev_get_queue(conf->disks[i].rdev->bdev); | 89 | struct request_queue *r_queue = bdev_get_queue(conf->disks[i].rdev->bdev); |
| 90 | if (r_queue->unplug_fn) | 90 | if (r_queue->unplug_fn) |
| 91 | r_queue->unplug_fn(r_queue); | 91 | r_queue->unplug_fn(r_queue); |
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | static int linear_issue_flush(request_queue_t *q, struct gendisk *disk, | 95 | static int linear_issue_flush(struct request_queue *q, struct gendisk *disk, |
| 96 | sector_t *error_sector) | 96 | sector_t *error_sector) |
| 97 | { | 97 | { |
| 98 | mddev_t *mddev = q->queuedata; | 98 | mddev_t *mddev = q->queuedata; |
| @@ -101,7 +101,7 @@ static int linear_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
| 101 | 101 | ||
| 102 | for (i=0; i < mddev->raid_disks && ret == 0; i++) { | 102 | for (i=0; i < mddev->raid_disks && ret == 0; i++) { |
| 103 | struct block_device *bdev = conf->disks[i].rdev->bdev; | 103 | struct block_device *bdev = conf->disks[i].rdev->bdev; |
| 104 | request_queue_t *r_queue = bdev_get_queue(bdev); | 104 | struct request_queue *r_queue = bdev_get_queue(bdev); |
| 105 | 105 | ||
| 106 | if (!r_queue->issue_flush_fn) | 106 | if (!r_queue->issue_flush_fn) |
| 107 | ret = -EOPNOTSUPP; | 107 | ret = -EOPNOTSUPP; |
| @@ -118,7 +118,7 @@ static int linear_congested(void *data, int bits) | |||
| 118 | int i, ret = 0; | 118 | int i, ret = 0; |
| 119 | 119 | ||
| 120 | for (i = 0; i < mddev->raid_disks && !ret ; i++) { | 120 | for (i = 0; i < mddev->raid_disks && !ret ; i++) { |
| 121 | request_queue_t *q = bdev_get_queue(conf->disks[i].rdev->bdev); | 121 | struct request_queue *q = bdev_get_queue(conf->disks[i].rdev->bdev); |
| 122 | ret |= bdi_congested(&q->backing_dev_info, bits); | 122 | ret |= bdi_congested(&q->backing_dev_info, bits); |
| 123 | } | 123 | } |
| 124 | return ret; | 124 | return ret; |
| @@ -330,7 +330,7 @@ static int linear_stop (mddev_t *mddev) | |||
| 330 | return 0; | 330 | return 0; |
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | static int linear_make_request (request_queue_t *q, struct bio *bio) | 333 | static int linear_make_request (struct request_queue *q, struct bio *bio) |
| 334 | { | 334 | { |
| 335 | const int rw = bio_data_dir(bio); | 335 | const int rw = bio_data_dir(bio); |
| 336 | mddev_t *mddev = q->queuedata; | 336 | mddev_t *mddev = q->queuedata; |
