diff options
Diffstat (limited to 'drivers/md/raid0.c')
-rw-r--r-- | drivers/md/raid0.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 2c404f73a377..b8216bc6db45 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #define MD_DRIVER | 25 | #define MD_DRIVER |
26 | #define MD_PERSONALITY | 26 | #define MD_PERSONALITY |
27 | 27 | ||
28 | static void raid0_unplug(request_queue_t *q) | 28 | static void raid0_unplug(struct request_queue *q) |
29 | { | 29 | { |
30 | mddev_t *mddev = q->queuedata; | 30 | mddev_t *mddev = q->queuedata; |
31 | raid0_conf_t *conf = mddev_to_conf(mddev); | 31 | raid0_conf_t *conf = mddev_to_conf(mddev); |
@@ -33,14 +33,14 @@ static void raid0_unplug(request_queue_t *q) | |||
33 | int i; | 33 | int i; |
34 | 34 | ||
35 | for (i=0; i<mddev->raid_disks; i++) { | 35 | for (i=0; i<mddev->raid_disks; i++) { |
36 | request_queue_t *r_queue = bdev_get_queue(devlist[i]->bdev); | 36 | struct request_queue *r_queue = bdev_get_queue(devlist[i]->bdev); |
37 | 37 | ||
38 | if (r_queue->unplug_fn) | 38 | if (r_queue->unplug_fn) |
39 | r_queue->unplug_fn(r_queue); | 39 | r_queue->unplug_fn(r_queue); |
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | static int raid0_issue_flush(request_queue_t *q, struct gendisk *disk, | 43 | static int raid0_issue_flush(struct request_queue *q, struct gendisk *disk, |
44 | sector_t *error_sector) | 44 | sector_t *error_sector) |
45 | { | 45 | { |
46 | mddev_t *mddev = q->queuedata; | 46 | mddev_t *mddev = q->queuedata; |
@@ -50,7 +50,7 @@ static int raid0_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
50 | 50 | ||
51 | for (i=0; i<mddev->raid_disks && ret == 0; i++) { | 51 | for (i=0; i<mddev->raid_disks && ret == 0; i++) { |
52 | struct block_device *bdev = devlist[i]->bdev; | 52 | struct block_device *bdev = devlist[i]->bdev; |
53 | request_queue_t *r_queue = bdev_get_queue(bdev); | 53 | struct request_queue *r_queue = bdev_get_queue(bdev); |
54 | 54 | ||
55 | if (!r_queue->issue_flush_fn) | 55 | if (!r_queue->issue_flush_fn) |
56 | ret = -EOPNOTSUPP; | 56 | ret = -EOPNOTSUPP; |
@@ -68,7 +68,7 @@ static int raid0_congested(void *data, int bits) | |||
68 | int i, ret = 0; | 68 | int i, ret = 0; |
69 | 69 | ||
70 | for (i = 0; i < mddev->raid_disks && !ret ; i++) { | 70 | for (i = 0; i < mddev->raid_disks && !ret ; i++) { |
71 | request_queue_t *q = bdev_get_queue(devlist[i]->bdev); | 71 | struct request_queue *q = bdev_get_queue(devlist[i]->bdev); |
72 | 72 | ||
73 | ret |= bdi_congested(&q->backing_dev_info, bits); | 73 | ret |= bdi_congested(&q->backing_dev_info, bits); |
74 | } | 74 | } |
@@ -268,7 +268,7 @@ static int create_strip_zones (mddev_t *mddev) | |||
268 | * | 268 | * |
269 | * Return amount of bytes we can accept at this offset | 269 | * Return amount of bytes we can accept at this offset |
270 | */ | 270 | */ |
271 | static int raid0_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *biovec) | 271 | static int raid0_mergeable_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *biovec) |
272 | { | 272 | { |
273 | mddev_t *mddev = q->queuedata; | 273 | mddev_t *mddev = q->queuedata; |
274 | sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev); | 274 | sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev); |
@@ -408,7 +408,7 @@ static int raid0_stop (mddev_t *mddev) | |||
408 | return 0; | 408 | return 0; |
409 | } | 409 | } |
410 | 410 | ||
411 | static int raid0_make_request (request_queue_t *q, struct bio *bio) | 411 | static int raid0_make_request (struct request_queue *q, struct bio *bio) |
412 | { | 412 | { |
413 | mddev_t *mddev = q->queuedata; | 413 | mddev_t *mddev = q->queuedata; |
414 | unsigned int sect_in_chunk, chunksize_bits, chunk_size, chunk_sects; | 414 | unsigned int sect_in_chunk, chunksize_bits, chunk_size, chunk_sects; |