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: 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>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 6c0bc1c7b1e1ab0aca333721053060f119583669..243eede9bbdbd3d69e17b203f655290e14b0551f 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -943,7 +943,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
        storvsc_req->on_io_completion = request_completion;
        storvsc_req->context = blkvsc_req;
 
-       storvsc_req->host = blkdev->port;
+       vm_srb->port_number = blkdev->port;
        storvsc_req->bus = blkdev->path;
        storvsc_req->target_id = blkdev->target;
        storvsc_req->lun_id = 0;         /* this is not really used at all */

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index b580c30ade99d992db6a028d91de27db8bd59d70..7273f7784c974d64517382e29b0e00fe3c971afb 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -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.port_number = request->host;
        vstor_packet->vm_srb.path_id = request->bus;
        vstor_packet->vm_srb.target_id = request->target_id;
        vstor_packet->vm_srb.lun = request->lun_id;

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 27781f46a293182c4245db71822cc2d9df50b085..f9dc4f1d0f9af1a4a4be1cd6d37d2161afea3885 100644 (file)
--- 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 host;
        u32 bus;
        u32 target_id;
        u32 lun_id;

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index b08423bb07d29823061b0b521f9bd645d958e0d4..05bcab62528191fdf631fc601127f9acff11b2e0 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -774,7 +774,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
        request->context = cmd_request;/* scmnd; */
 
        /* 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->target_id = scmnd->device->id;
        request->lun_id = scmnd->device->lun;