[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1302012306-21277-17-git-send-email-kys@microsoft.com>
Date: Tue, 5 Apr 2011 07:05:01 -0700
From: "K. Y. Srinivasan" <kys@...rosoft.com>
To: gregkh@...e.de, linux-kernel@...r.kernel.org,
devel@...uxdriverproject.org, virtualization@...ts.osdl.org
Cc: "K. Y. Srinivasan" <kys@...rosoft.com>,
Haiyang Zhang <haiyangz@...rosoft.com>,
Abhishek Kane <v-abkane@...rosoft.com>,
Hank Janssen <hjanssen@...rosoft.com>
Subject: [PATCH 17/22] Staging: hv: Move on_io_completion() from struct hv_storvsc_request
In preparation of consolidating all I/O request state, move
the on_io_completion() field from struct hv_storvsc_request to
struct storvsc_request_extension.
Signed-off-by: K. Y. Srinivasan <kys@...rosoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@...rosoft.com>
Signed-off-by: Abhishek Kane <v-abkane@...rosoft.com>
Signed-off-by: Hank Janssen <hjanssen@...rosoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 2 +-
drivers/staging/hv/storvsc.c | 2 +-
drivers/staging/hv/storvsc_api.h | 2 +-
drivers/staging/hv/storvsc_drv.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 83c4ba3..0e3b193 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -938,7 +938,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
vm_srb->data_in = blkvsc_req->write ? WRITE_TYPE : READ_TYPE;
- storvsc_req->on_io_completion = request_completion;
+ storvsc_req->extension.on_io_completion = request_completion;
storvsc_req->extension.context = blkvsc_req;
vm_srb->port_number = blkdev->port;
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index e0d635f..8649044 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -324,7 +324,7 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
/* TODO: */
request->bytes_xfer = vstor_packet->vm_srb.data_transfer_length;
- request->on_io_completion(request);
+ request->extension.on_io_completion(request);
atomic_dec(&stor_device->num_outstanding_req);
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 68c5036..89fa155 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -64,6 +64,7 @@ struct storvsc_request_extension {
unsigned char *sense_buffer;
void *context;
+ void (*on_io_completion)(struct hv_storvsc_request *request);
struct vstor_packet vstor_packet;
};
@@ -72,7 +73,6 @@ struct hv_storvsc_request {
u32 status;
u32 bytes_xfer;
- void (*on_io_completion)(struct hv_storvsc_request *request);
struct storvsc_request_extension extension;
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index e0e349e..25b25b3 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -770,7 +770,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
break;
}
- request->on_io_completion = storvsc_commmand_completion;
+ request->extension.on_io_completion = storvsc_commmand_completion;
request->extension.context = cmd_request;/* scmnd; */
/* request->PortId = scmnd->device->channel; */
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists