Staging: hv: Get rid of sense_buffer_size from struct hv_storvsc_request

In preparation for consolidating all I/O request state, get rid of the
sense_buffer_size field from struct hv_storvsc_request and instead
hardcode this value as is currently done.

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 daa47579f4b7b03aa6df1feea706398cda7771f0..838567defb98ef4b0e53f2773179ac02c250708c 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -953,7 +953,6 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
        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;
 
        ret = storvsc_drv_obj->on_io_request(blkdev->device_ctx,
                                           &blkvsc_req->request);

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index ca41c0556a97404eea3cf7d2494685bb5ca076a8..b322f863dbd25ac9a8c83b3038cd740ca850e89f 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -318,8 +318,6 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
                               vstor_packet->vm_srb.sense_data,
                               vstor_packet->vm_srb.sense_info_length);
 
-                       request->sense_buffer_size =
-                                       vstor_packet->vm_srb.sense_info_length;
                }
        }
 

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 55c5cc6087e7d1fefac494059ed197b315890172..3eccc277ba480a8699913571760ab6ee5c6e629c 100644 (file)
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -70,7 +70,6 @@ struct hv_storvsc_request {
        u32 bytes_xfer;
 
        unsigned char *sense_buffer;
-       u32 sense_buffer_size;
 
        void *context;
 

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 08c2df4d2616d593d0406bee356b906dbd2dc585..bc435d6cc49366a531d038f8d25e1f2fafab6a86 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -477,7 +477,7 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
 
        if (scmnd->result) {
                if (scsi_normalize_sense(scmnd->sense_buffer,
-                               request->sense_buffer_size, &sense_hdr))
+                               SCSI_SENSE_BUFFERSIZE, &sense_hdr))
                        scsi_print_sense_hdr("storvsc", &sense_hdr);
        }
 
@@ -785,7 +785,6 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
        memcpy(vm_srb->cdb, scmnd->cmnd, vm_srb->cdb_length);
 
        request->sense_buffer = scmnd->sense_buffer;
-       request->sense_buffer_size = SCSI_SENSE_BUFFERSIZE;
 
 
        request->data_buffer.len = scsi_bufflen(scmnd);