Staging: hv: Get rid of the target_id from struct hv_storvsc_request

In preparation for consolidating all I/O request state, get rid of the
target_id field from struct hv_storvsc_request and instead use the
equivalent  state in struct vmscsi_request - target_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 29b8e408cd3218f91d4e87986bd00de28a283559..b0eecf8fe710ed79a19d3b199341769ed7c88fb1 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -945,7 +945,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
 
        vm_srb->port_number = blkdev->port;
        vm_srb->path_id = blkdev->path;
-       storvsc_req->target_id = blkdev->target;
+       vm_srb->target_id = blkdev->target;
        storvsc_req->lun_id = 0;         /* this is not really used at all */
 
        storvsc_req->cdb_len = blkvsc_req->cmd_len;

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index c307922a7992118eefcacb0287c29f9569c42b14..2282ba20dbab2177af3e3aa3c80e29940dd8fc17 100644 (file)
--- 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  target %d, lun %d cdblen %d",
+       DPRINT_DBG(STORVSC, "req %p len %d lun %d cdblen %d",
                   request, request->data_buffer.len,
-                  request->target_id, request->lun_id, request->cdb_len);
+                  request->lun_id, 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.target_id = request->target_id;
        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 07a391befff07bb0c72c92c7ef513de46a29f9e3..54690ad5f26b371cf3e57e3da17855791476413b 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 target_id;
        u32 lun_id;
        u8 *cdb;
        u32 cdb_len;

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