From mboxrd@z Thu Jan 1 00:00:00 1970 From: "K. Y. Srinivasan" Subject: [PATCH 14/20] Staging: hv: Move sense_buffer field Date: Mon, 28 Mar 2011 09:33:39 -0700 Message-ID: <1301330025-25542-14-git-send-email-kys@microsoft.com> References: <1301329950-25490-1-git-send-email-kys@microsoft.com> <1301330025-25542-1-git-send-email-kys@microsoft.com> Return-path: In-Reply-To: <1301330025-25542-1-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org To: gregkh@suse.de, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org Cc: "K. Y. Srinivasan" , Haiyang Zhang , Abhishek Kane , Hank Janssen List-Id: virtualization@lists.linuxfoundation.org In preparation for consolidating all I/O request state, move sense_buffer field from struct hv_storvsc_request to struct storvsc_request_extension. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen --- drivers/staging/hv/blkvsc_drv.c | 2 +- drivers/staging/hv/storvsc.c | 2 +- drivers/staging/hv/storvsc_api.h | 4 ++-- drivers/staging/hv/storvsc_drv.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 04117be..be7fae5 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -950,7 +950,7 @@ 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->extension.sense_buffer = blkvsc_req->sense_buffer; 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 b322f86..33943ed 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -314,7 +314,7 @@ static void stor_vsc_on_io_completion(struct hv_device *device, "valid - len %d\n", request_ext, vstor_packet->vm_srb.sense_info_length); - memcpy(request->sense_buffer, + memcpy(request->extension.sense_buffer, vstor_packet->vm_srb.sense_data, vstor_packet->vm_srb.sense_info_length); diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index 3eccc27..fd9165f 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -62,6 +62,8 @@ struct storvsc_request_extension { /* Synchronize the request/response if needed */ struct completion wait_event; + unsigned char *sense_buffer; + struct vstor_packet vstor_packet; }; @@ -69,8 +71,6 @@ struct hv_storvsc_request { u32 status; u32 bytes_xfer; - unsigned char *sense_buffer; - void *context; void (*on_io_completion)(struct hv_storvsc_request *request); diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index bc435d6..3a999d0 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -784,7 +784,7 @@ 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->extension.sense_buffer = scmnd->sense_buffer; request->data_buffer.len = scsi_bufflen(scmnd); -- 1.7.4.1