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

In preparation for consolidating all I/O request state, get rid of the
bus field from struct hv_storvsc_request and instead use the
equivalent  state in struct vmscsi_request - path_id 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 243eede9bbdbd3d69e17b203f655290e14b0551f..29b8e408cd3218f91d4e87986bd00de28a283559 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -944,7 +944,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
        storvsc_req->context = blkvsc_req;
 
        vm_srb->port_number = blkdev->port;
-       storvsc_req->bus = blkdev->path;
+       vm_srb->path_id = 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 7273f7784c974d64517382e29b0e00fe3c971afb..c307922a7992118eefcacb0287c29f9569c42b14 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -531,8 +531,8 @@ 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 bus %d, target %d, lun %d cdblen %d",
-                  request, request->data_buffer.len, request->bus,
+       DPRINT_DBG(STORVSC, "req %p len %d  target %d, lun %d cdblen %d",
+                  request, request->data_buffer.len,
                   request->target_id, request->lun_id, request->cdb_len);
 
        if (!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.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 f9dc4f1d0f9af1a4a4be1cd6d37d2161afea3885..07a391befff07bb0c72c92c7ef513de46a29f9e3 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 bus;
        u32 target_id;
        u32 lun_id;
        u8 *cdb;

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 05bcab62528191fdf631fc601127f9acff11b2e0..05339bf1eb0d3af4efcc07ffb3074e7f34e63bb2 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -775,7 +775,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
 
        /* request->PortId = scmnd->device->channel; */
        vm_srb->port_number = host_device_ctx->port;
-       request->bus = scmnd->device->channel;
+       vm_srb->path_id = scmnd->device->channel;
        request->target_id = scmnd->device->id;
        request->lun_id = scmnd->device->lun;