diff options
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
-rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index b8c5cdde324..17f1b344fbc 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c | |||
@@ -72,8 +72,7 @@ struct storvsc_driver_context { | |||
72 | 72 | ||
73 | /* Static decl */ | 73 | /* Static decl */ |
74 | static int storvsc_probe(struct device *dev); | 74 | static int storvsc_probe(struct device *dev); |
75 | static int storvsc_queuecommand(struct scsi_cmnd *scmnd, | 75 | static int storvsc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd); |
76 | void (*done)(struct scsi_cmnd *)); | ||
77 | static int storvsc_device_alloc(struct scsi_device *); | 76 | static int storvsc_device_alloc(struct scsi_device *); |
78 | static int storvsc_device_configure(struct scsi_device *); | 77 | static int storvsc_device_configure(struct scsi_device *); |
79 | static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd); | 78 | static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd); |
@@ -596,7 +595,7 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl, | |||
596 | /* | 595 | /* |
597 | * storvsc_queuecommand - Initiate command processing | 596 | * storvsc_queuecommand - Initiate command processing |
598 | */ | 597 | */ |
599 | static int storvsc_queuecommand(struct scsi_cmnd *scmnd, | 598 | static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, |
600 | void (*done)(struct scsi_cmnd *)) | 599 | void (*done)(struct scsi_cmnd *)) |
601 | { | 600 | { |
602 | int ret; | 601 | int ret; |
@@ -784,6 +783,8 @@ retry_request: | |||
784 | return ret; | 783 | return ret; |
785 | } | 784 | } |
786 | 785 | ||
786 | static DEF_SCSI_QCMD(storvsc_queuecommand) | ||
787 | |||
787 | static int storvsc_merge_bvec(struct request_queue *q, | 788 | static int storvsc_merge_bvec(struct request_queue *q, |
788 | struct bvec_merge_data *bmd, struct bio_vec *bvec) | 789 | struct bvec_merge_data *bmd, struct bio_vec *bvec) |
789 | { | 790 | { |