diff options
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index da63c544919b..21c075d44db1 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -654,7 +654,7 @@ void scsi_run_host_queues(struct Scsi_Host *shost) | |||
| 654 | static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate, | 654 | static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate, |
| 655 | int bytes, int requeue) | 655 | int bytes, int requeue) |
| 656 | { | 656 | { |
| 657 | request_queue_t *q = cmd->device->request_queue; | 657 | struct request_queue *q = cmd->device->request_queue; |
| 658 | struct request *req = cmd->request; | 658 | struct request *req = cmd->request; |
| 659 | unsigned long flags; | 659 | unsigned long flags; |
| 660 | 660 | ||
| @@ -818,7 +818,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) | |||
| 818 | { | 818 | { |
| 819 | int result = cmd->result; | 819 | int result = cmd->result; |
| 820 | int this_count = cmd->request_bufflen; | 820 | int this_count = cmd->request_bufflen; |
| 821 | request_queue_t *q = cmd->device->request_queue; | 821 | struct request_queue *q = cmd->device->request_queue; |
| 822 | struct request *req = cmd->request; | 822 | struct request *req = cmd->request; |
| 823 | int clear_errors = 1; | 823 | int clear_errors = 1; |
| 824 | struct scsi_sense_hdr sshdr; | 824 | struct scsi_sense_hdr sshdr; |
| @@ -1038,7 +1038,7 @@ static int scsi_init_io(struct scsi_cmnd *cmd) | |||
| 1038 | return BLKPREP_KILL; | 1038 | return BLKPREP_KILL; |
| 1039 | } | 1039 | } |
| 1040 | 1040 | ||
| 1041 | static int scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk, | 1041 | static int scsi_issue_flush_fn(struct request_queue *q, struct gendisk *disk, |
| 1042 | sector_t *error_sector) | 1042 | sector_t *error_sector) |
| 1043 | { | 1043 | { |
| 1044 | struct scsi_device *sdev = q->queuedata; | 1044 | struct scsi_device *sdev = q->queuedata; |
| @@ -1340,7 +1340,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q, | |||
| 1340 | /* | 1340 | /* |
| 1341 | * Kill a request for a dead device | 1341 | * Kill a request for a dead device |
| 1342 | */ | 1342 | */ |
| 1343 | static void scsi_kill_request(struct request *req, request_queue_t *q) | 1343 | static void scsi_kill_request(struct request *req, struct request_queue *q) |
| 1344 | { | 1344 | { |
| 1345 | struct scsi_cmnd *cmd = req->special; | 1345 | struct scsi_cmnd *cmd = req->special; |
| 1346 | struct scsi_device *sdev = cmd->device; | 1346 | struct scsi_device *sdev = cmd->device; |
| @@ -2119,7 +2119,7 @@ EXPORT_SYMBOL(scsi_target_resume); | |||
| 2119 | int | 2119 | int |
| 2120 | scsi_internal_device_block(struct scsi_device *sdev) | 2120 | scsi_internal_device_block(struct scsi_device *sdev) |
| 2121 | { | 2121 | { |
| 2122 | request_queue_t *q = sdev->request_queue; | 2122 | struct request_queue *q = sdev->request_queue; |
| 2123 | unsigned long flags; | 2123 | unsigned long flags; |
| 2124 | int err = 0; | 2124 | int err = 0; |
| 2125 | 2125 | ||
| @@ -2159,7 +2159,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block); | |||
| 2159 | int | 2159 | int |
| 2160 | scsi_internal_device_unblock(struct scsi_device *sdev) | 2160 | scsi_internal_device_unblock(struct scsi_device *sdev) |
| 2161 | { | 2161 | { |
| 2162 | request_queue_t *q = sdev->request_queue; | 2162 | struct request_queue *q = sdev->request_queue; |
| 2163 | int err; | 2163 | int err; |
| 2164 | unsigned long flags; | 2164 | unsigned long flags; |
| 2165 | 2165 | ||
