Staging: hv: Get rid of cdb from struct hv_storvsc_request

In preparation for consolidating all I/O request state, get rid of the
cdb field from struct hv_storvsc_request and instead
directly copy the command into struct vmscsi_request.

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 fb41a5bae48060eca5d35450fccf9ef3f7a76ee2..daa47579f4b7b03aa6df1feea706398cda7771f0 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -949,7 +949,8 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
        vm_srb->lun = 0;         /* this is not really used at all */
 
        vm_srb->cdb_length = blkvsc_req->cmd_len;
-       storvsc_req->cdb = blkvsc_req->cmnd;
+
+       memcpy(vm_srb->cdb, blkvsc_req->cmnd, vm_srb->cdb_length);
 
        storvsc_req->sense_buffer = blkvsc_req->sense_buffer;
        storvsc_req->sense_buffer_size = SCSI_SENSE_BUFFERSIZE;

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 5a5065c7a56e6c4c43f70fe6b963d78864864233..ca41c0556a97404eea3cf7d2494685bb5ca076a8 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -301,7 +301,8 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
        if (request->status != 0 || vstor_packet->vm_srb.srb_status != 1) {
                DPRINT_WARN(STORVSC,
                            "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
-                           request->cdb[0], vstor_packet->vm_srb.scsi_status,
+                           vstor_packet->vm_srb.cdb[0],
+                           vstor_packet->vm_srb.scsi_status,
                            vstor_packet->vm_srb.srb_status);
        }
 
@@ -551,9 +552,6 @@ int stor_vsc_on_io_request(struct hv_device *device,
 
        vstor_packet->vm_srb.sense_info_length = SENSE_BUFFER_SIZE;
 
-       /* Copy over the scsi command descriptor block */
-       memcpy(&vstor_packet->vm_srb.cdb, request->cdb,
-                vstor_packet->vm_srb.cdb_length);
 
        vstor_packet->vm_srb.data_transfer_length = request->data_buffer.len;
 

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index fd3af2b69cdafe6707a12cbd8f3b863dbf30d88d..55c5cc6087e7d1fefac494059ed197b315890172 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 {
-       u8 *cdb;
        u32 status;
        u32 bytes_xfer;
 

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index c0ccae25460fe5d62f7f07530e3234e04f11d762..08c2df4d2616d593d0406bee356b906dbd2dc585 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -781,7 +781,8 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
 
        /* ASSERT(scmnd->cmd_len <= 16); */
        vm_srb->cdb_length = scmnd->cmd_len;
-       request->cdb = scmnd->cmnd;
+
+       memcpy(vm_srb->cdb, scmnd->cmnd, vm_srb->cdb_length);
 
        request->sense_buffer = scmnd->sense_buffer;
        request->sense_buffer_size = SCSI_SENSE_BUFFERSIZE;