Commit 124661de authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Staging: hv: Get rid of the host field from struct hv_storvsc_request

In preparation for consolidating all I/O request state, get rid of the
host field from struct hv_storvsc_request and instead use the
equivalent  state in struct vmscsi_request - port_number field.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 12fbd416
...@@ -943,7 +943,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, ...@@ -943,7 +943,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
storvsc_req->on_io_completion = request_completion; storvsc_req->on_io_completion = request_completion;
storvsc_req->context = blkvsc_req; storvsc_req->context = blkvsc_req;
storvsc_req->host = blkdev->port; vm_srb->port_number = blkdev->port;
storvsc_req->bus = blkdev->path; storvsc_req->bus = blkdev->path;
storvsc_req->target_id = blkdev->target; storvsc_req->target_id = blkdev->target;
storvsc_req->lun_id = 0; /* this is not really used at all */ storvsc_req->lun_id = 0; /* this is not really used at all */
......
...@@ -549,7 +549,6 @@ int stor_vsc_on_io_request(struct hv_device *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.length = sizeof(struct vmscsi_request);
vstor_packet->vm_srb.port_number = request->host;
vstor_packet->vm_srb.path_id = request->bus; vstor_packet->vm_srb.path_id = request->bus;
vstor_packet->vm_srb.target_id = request->target_id; vstor_packet->vm_srb.target_id = request->target_id;
vstor_packet->vm_srb.lun = request->lun_id; vstor_packet->vm_srb.lun = request->lun_id;
......
...@@ -66,7 +66,6 @@ struct storvsc_request_extension { ...@@ -66,7 +66,6 @@ struct storvsc_request_extension {
}; };
struct hv_storvsc_request { struct hv_storvsc_request {
u32 host;
u32 bus; u32 bus;
u32 target_id; u32 target_id;
u32 lun_id; u32 lun_id;
......
...@@ -774,7 +774,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, ...@@ -774,7 +774,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
request->context = cmd_request;/* scmnd; */ request->context = cmd_request;/* scmnd; */
/* request->PortId = scmnd->device->channel; */ /* request->PortId = scmnd->device->channel; */
request->host = host_device_ctx->port; vm_srb->port_number = host_device_ctx->port;
request->bus = scmnd->device->channel; request->bus = scmnd->device->channel;
request->target_id = scmnd->device->id; request->target_id = scmnd->device->id;
request->lun_id = scmnd->device->lun; request->lun_id = scmnd->device->lun;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment