Skip to content

Commit

Permalink
Staging: hv: Move the function storvsc_merge_bvec() to earlier in the…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent 5b60ace commit a1ebfea
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -823,13 +830,6 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,

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,
Expand Down

0 comments on commit a1ebfea

Please sign in to comment.