From 3fa8595fa326be375b3465ea49901a994930e909 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Wed, 23 Mar 2011 10:50:21 -0700
Subject: [PATCH] --- yaml --- r: 248917 b: refs/heads/master c:
 f24eeb06a430f8508d03a419ff4274d5596a5436 h: refs/heads/master i:   248915:
 02f6a9187816267fb5dbfed7372e45d30974e776 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/hv/storvsc.c     | 26 --------------------------
 trunk/drivers/staging/hv/storvsc_api.h | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 7bfe68bcaa93..5b47217976c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 036bbeda8c802c438e167d35a3ce726bcb0bb42e
+refs/heads/master: f24eeb06a430f8508d03a419ff4274d5596a5436
diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index 56f3cc9d860b..be1c77a1d232 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h
index 629144c43664..2b814bd12bca 100644
--- a/trunk/drivers/staging/hv/storvsc_api.h
+++ b/trunk/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);