From 26450b14394ced99786f72fc72b9cbb9a7363c0b Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Wed, 23 Mar 2011 10:50:20 -0700
Subject: [PATCH] --- yaml --- r: 248916 b: refs/heads/master c:
 036bbeda8c802c438e167d35a3ce726bcb0bb42e h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/hv/blkvsc.c      |  1 +
 trunk/drivers/staging/hv/storvsc.c     | 13 -------------
 trunk/drivers/staging/hv/storvsc_api.h | 12 ++++++++++++
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 5f7116f7dbd6..7bfe68bcaa93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e1870a847c2bd40a56f3a8807bf12ad2bf28c33
+refs/heads/master: 036bbeda8c802c438e167d35a3ce726bcb0bb42e
diff --git a/trunk/drivers/staging/hv/blkvsc.c b/trunk/drivers/staging/hv/blkvsc.c
index 7c8729bc8329..88d6e3c14df3 100644
--- a/trunk/drivers/staging/hv/blkvsc.c
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index e2ad72924184..56f3cc9d860b 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h
index fbf57556d890..629144c43664 100644
--- a/trunk/drivers/staging/hv/storvsc_api.h
+++ b/trunk/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);