diff options
Diffstat (limited to 'drivers/s390/block')
-rw-r--r-- | drivers/s390/block/dasd.c | 4 | ||||
-rw-r--r-- | drivers/s390/block/dasd_int.h | 2 | ||||
-rw-r--r-- | drivers/s390/block/dcssblk.c | 2 | ||||
-rw-r--r-- | drivers/s390/block/xpram.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index bfeca57098fa..e6bfce690ca3 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
@@ -1187,7 +1187,7 @@ dasd_end_request_cb(struct dasd_ccw_req * cqr, void *data) | |||
1187 | static void | 1187 | static void |
1188 | __dasd_process_blk_queue(struct dasd_device * device) | 1188 | __dasd_process_blk_queue(struct dasd_device * device) |
1189 | { | 1189 | { |
1190 | request_queue_t *queue; | 1190 | struct request_queue *queue; |
1191 | struct request *req; | 1191 | struct request *req; |
1192 | struct dasd_ccw_req *cqr; | 1192 | struct dasd_ccw_req *cqr; |
1193 | int nr_queued; | 1193 | int nr_queued; |
@@ -1740,7 +1740,7 @@ dasd_cancel_req(struct dasd_ccw_req *cqr) | |||
1740 | * Dasd request queue function. Called from ll_rw_blk.c | 1740 | * Dasd request queue function. Called from ll_rw_blk.c |
1741 | */ | 1741 | */ |
1742 | static void | 1742 | static void |
1743 | do_dasd_request(request_queue_t * queue) | 1743 | do_dasd_request(struct request_queue * queue) |
1744 | { | 1744 | { |
1745 | struct dasd_device *device; | 1745 | struct dasd_device *device; |
1746 | 1746 | ||
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index 241294cba415..aeda52682446 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
@@ -293,7 +293,7 @@ struct dasd_uid { | |||
293 | struct dasd_device { | 293 | struct dasd_device { |
294 | /* Block device stuff. */ | 294 | /* Block device stuff. */ |
295 | struct gendisk *gdp; | 295 | struct gendisk *gdp; |
296 | request_queue_t *request_queue; | 296 | struct request_queue *request_queue; |
297 | spinlock_t request_queue_lock; | 297 | spinlock_t request_queue_lock; |
298 | struct block_device *bdev; | 298 | struct block_device *bdev; |
299 | unsigned int devindex; | 299 | unsigned int devindex; |
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 35765f6a86e0..4d8798bacf97 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -621,7 +621,7 @@ out: | |||
621 | } | 621 | } |
622 | 622 | ||
623 | static int | 623 | static int |
624 | dcssblk_make_request(request_queue_t *q, struct bio *bio) | 624 | dcssblk_make_request(struct request_queue *q, struct bio *bio) |
625 | { | 625 | { |
626 | struct dcssblk_dev_info *dev_info; | 626 | struct dcssblk_dev_info *dev_info; |
627 | struct bio_vec *bvec; | 627 | struct bio_vec *bvec; |
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index a04d9120cef0..354a060e5bec 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
@@ -191,7 +191,7 @@ static unsigned long __init xpram_highest_page_index(void) | |||
191 | /* | 191 | /* |
192 | * Block device make request function. | 192 | * Block device make request function. |
193 | */ | 193 | */ |
194 | static int xpram_make_request(request_queue_t *q, struct bio *bio) | 194 | static int xpram_make_request(struct request_queue *q, struct bio *bio) |
195 | { | 195 | { |
196 | xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data; | 196 | xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data; |
197 | struct bio_vec *bvec; | 197 | struct bio_vec *bvec; |