Staging: hv: Move the definition of struct storvsc_device

In preparation for getting rid of the inclusion of storvsc.c from
blkvsc.c, move the definition of struct storvsc_device
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>

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 56f3cc9d860ba1c195e7b21257bc9253eddf5907..be1c77a1d2323736bec774bd2f30d4a05bd7eb6e 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -33,32 +33,6 @@
 #include "channel.h"
 
 
-/* A storvsc device is a device object that contains a vmbus channel */
-struct storvsc_device {
-       struct hv_device *device;
-
-       /* 0 indicates the device is being destroyed */
-       atomic_t ref_count;
-
-       atomic_t num_outstanding_req;
-
-       /*
-        * Each unique Port/Path/Target represents 1 channel ie scsi
-        * controller. In reality, the pathid, targetid is always 0
-        * and the port is set by us
-        */
-       unsigned int port_number;
-       unsigned char path_id;
-       unsigned char target_id;
-
-       /* LIST_ENTRY OutstandingRequestList; */
-       /* HANDLE OutstandingRequestLock; */
-
-       /* Used for vsc/vsp channel reset process */
-       struct storvsc_request_extension init_request;
-       struct storvsc_request_extension reset_request;
-};
-
 
 static const char *g_driver_name = "storvsc";
 

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 629144c436641d204cc0484582f68e5ff55a98e9..2b814bd12bca754afe55120576f6a204cb005c56 100644 (file)
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -114,6 +114,32 @@ struct storvsc_request_extension {
        struct vstor_packet vstor_packet;
 };
 
+/* A storvsc device is a device object that contains a vmbus channel */
+struct storvsc_device {
+       struct hv_device *device;
+
+       /* 0 indicates the device is being destroyed */
+       atomic_t ref_count;
+
+       atomic_t num_outstanding_req;
+
+       /*
+        * Each unique Port/Path/Target represents 1 channel ie scsi
+        * controller. In reality, the pathid, targetid is always 0
+        * and the port is set by us
+        */
+       unsigned int port_number;
+       unsigned char path_id;
+       unsigned char target_id;
+
+       /* LIST_ENTRY OutstandingRequestList; */
+       /* HANDLE OutstandingRequestLock; */
+
+       /* Used for vsc/vsp channel reset process */
+       struct storvsc_request_extension init_request;
+       struct storvsc_request_extension reset_request;
+};
+
 /* Interface */
 int stor_vsc_initialize(struct hv_driver *driver);
 int stor_vsc_on_host_reset(struct hv_device *device);