diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-28 09:33:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:55:08 -0700 |
| commit | fc3967b0c3169fe8a3b33cc90e5bc8248d5b18d9 (patch) | |
| tree | 50762805e9ab2d7874e54b6f4d9119e4a6cadf42 | |
| parent | b4dba0a3b4008c48316f712283c682f422b2c973 (diff) | |
| download | op-kernel-dev-fc3967b0c3169fe8a3b33cc90e5bc8248d5b18d9.zip op-kernel-dev-fc3967b0c3169fe8a3b33cc90e5bc8248d5b18d9.tar.gz | |
Staging: hv: Get rid of lun_id from struct hv_storvsc_request
In preparation for consolidating all I/O request state, get rid of the
lun_id field from struct hv_storvsc_request and instead use the
equivalent state in struct vmscsi_request - lun field.
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>
| -rw-r--r-- | drivers/staging/hv/blkvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc.c | 5 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc_api.h | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index b0eecf8..6458623 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -946,7 +946,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, vm_srb->port_number = blkdev->port; vm_srb->path_id = blkdev->path; vm_srb->target_id = blkdev->target; - storvsc_req->lun_id = 0; /* this is not really used at all */ + vm_srb->lun = 0; /* this is not really used at all */ storvsc_req->cdb_len = blkvsc_req->cmd_len; storvsc_req->cdb = blkvsc_req->cmnd; diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 2282ba2..849b467 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -531,9 +531,9 @@ int stor_vsc_on_io_request(struct hv_device *device, "Extension %p", device, stor_device, request, request_extension); - DPRINT_DBG(STORVSC, "req %p len %d lun %d cdblen %d", + DPRINT_DBG(STORVSC, "req %p len %d cdblen %d", request, request->data_buffer.len, - request->lun_id, request->cdb_len); + request->cdb_len); if (!stor_device) { DPRINT_ERR(STORVSC, "unable to get stor device..." @@ -549,7 +549,6 @@ int stor_vsc_on_io_request(struct hv_device *device, vstor_packet->vm_srb.length = sizeof(struct vmscsi_request); - vstor_packet->vm_srb.lun = request->lun_id; vstor_packet->vm_srb.sense_info_length = SENSE_BUFFER_SIZE; diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index 54690ad..940cf98 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -66,7 +66,6 @@ struct storvsc_request_extension { }; struct hv_storvsc_request { - u32 lun_id; u8 *cdb; u32 cdb_len; u32 status; diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index c77ddc1..d30d745 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -777,7 +777,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, vm_srb->port_number = host_device_ctx->port; vm_srb->path_id = scmnd->device->channel; vm_srb->target_id = scmnd->device->id; - request->lun_id = scmnd->device->lun; + vm_srb->lun = scmnd->device->lun; /* ASSERT(scmnd->cmd_len <= 16); */ request->cdb_len = scmnd->cmd_len; |
