diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-05-10 07:54:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 13:39:12 -0700 |
| commit | a1ebfeae887bd5ecd3ce23b7f5ee7dbc3190d427 (patch) | |
| tree | 4029bf0e1f6558951778f2ef523db02037c9a385 /drivers/staging/hv/storvsc_drv.c | |
| parent | 5b60aceedc7b1378f8f979722f7dd15b06d29ecf (diff) | |
| download | kernel_samsung_smdk4412-a1ebfeae887bd5ecd3ce23b7f5ee7dbc3190d427.zip kernel_samsung_smdk4412-a1ebfeae887bd5ecd3ce23b7f5ee7dbc3190d427.tar.gz kernel_samsung_smdk4412-a1ebfeae887bd5ecd3ce23b7f5ee7dbc3190d427.tar.bz2 | |
Staging: hv: Move the function storvsc_merge_bvec() to earlier in the file
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 2bd9c09..44dbaae 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -122,6 +122,13 @@ static int storvsc_device_alloc(struct scsi_device *sdevice) return 0; } +static int storvsc_merge_bvec(struct request_queue *q, + struct bvec_merge_data *bmd, struct bio_vec *bvec) +{ + /* checking done by caller. */ + return bvec->bv_len; +} + /* Static decl */ static int storvsc_probe(struct hv_device *dev); static int storvsc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd); @@ -823,13 +830,6 @@ retry_request: static DEF_SCSI_QCMD(storvsc_queuecommand) -static int storvsc_merge_bvec(struct request_queue *q, - struct bvec_merge_data *bmd, struct bio_vec *bvec) -{ - /* checking done by caller. */ - return bvec->bv_len; -} - static int storvsc_device_configure(struct scsi_device *sdevice) { scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG, |