diff options
| author | K. Y. Srinivasan | 2011-03-23 18:50:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-05 06:50:41 +0200 |
| commit | 036bbeda8c802c438e167d35a3ce726bcb0bb42e (patch) | |
| tree | 24304319f333dfa62f83a56275a6bfca9e5ba9a7 | |
| parent | Staging: hv: Add the inclusion guard for vstorage.h (diff) | |
| download | kernel-qcow2-linux-036bbeda8c802c438e167d35a3ce726bcb0bb42e.tar.gz kernel-qcow2-linux-036bbeda8c802c438e167d35a3ce726bcb0bb42e.tar.xz kernel-qcow2-linux-036bbeda8c802c438e167d35a3ce726bcb0bb42e.zip | |
Staging: hv: Move the definition of struct storvsc_request_extension
In preparation for getting rid of the inclusion of storvsc.c from
blkvsc.c, move the definition of struct storvsc_request_extension
from storvsc.c to storvsc_api.h.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/blkvsc.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc.c | 13 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc_api.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c index 7c8729bc8329..88d6e3c14df3 100644 --- a/drivers/staging/hv/blkvsc.c +++ b/drivers/staging/hv/blkvsc.c @@ -24,6 +24,7 @@ #include <linux/mm.h> #include "hv_api.h" #include "storvsc.c" +#include "storvsc_api.h" static const char *g_blk_driver_name = "blkvsc"; diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index e2ad72924184..56f3cc9d860b 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -33,19 +33,6 @@ #include "channel.h" -struct storvsc_request_extension { - /* LIST_ENTRY ListEntry; */ - - struct hv_storvsc_request *request; - struct hv_device *device; - - /* Synchronize the request/response if needed */ - int wait_condition; - wait_queue_head_t wait_event; - - struct vstor_packet vstor_packet; -}; - /* A storvsc device is a device object that contains a vmbus channel */ struct storvsc_device { struct hv_device *device; diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index fbf57556d890..629144c43664 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -25,6 +25,7 @@ #ifndef _STORVSC_API_H_ #define _STORVSC_API_H_ +#include "vstorage.h" #include "vmbus_api.h" /* Defines */ @@ -102,6 +103,17 @@ struct storvsc_device_info { unsigned char target_id; }; +struct storvsc_request_extension { + struct hv_storvsc_request *request; + struct hv_device *device; + + /* Synchronize the request/response if needed */ + int wait_condition; + wait_queue_head_t wait_event; + + struct vstor_packet vstor_packet; +}; + /* Interface */ int stor_vsc_initialize(struct hv_driver *driver); int stor_vsc_on_host_reset(struct hv_device *device); |