From b35d9be760e57a0ba42b3bf9a2afb88b390ba24c Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Thu, 10 Sep 2009 12:25:04 +0300
Subject: [PATCH] --- yaml --- r: 164632 b: refs/heads/master c:
 6951867b9967066eda090f46ad91ce69e0ead611 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/sunrpc/sched.c  |  7 ++-----
 trunk/net/sunrpc/sunrpc.h | 10 ++++++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b8cfbfce80c5..acd297e1566d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aed100fafb90aaabe8fb31e58af9dc7e68696507
+refs/heads/master: 6951867b9967066eda090f46ad91ce69e0ead611
diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c
index 8f459abe97cf..cef74ba0666c 100644
--- a/trunk/net/sunrpc/sched.c
+++ b/trunk/net/sunrpc/sched.c
@@ -21,6 +21,8 @@
 
 #include <linux/sunrpc/clnt.h>
 
+#include "sunrpc.h"
+
 #ifdef RPC_DEBUG
 #define RPCDBG_FACILITY		RPCDBG_SCHED
 #define RPC_TASK_MAGIC_ID	0xf00baa
@@ -711,11 +713,6 @@ static void rpc_async_schedule(struct work_struct *work)
 	__rpc_execute(container_of(work, struct rpc_task, u.tk_work));
 }
 
-struct rpc_buffer {
-	size_t	len;
-	char	data[];
-};
-
 /**
  * rpc_malloc - allocate an RPC buffer
  * @task: RPC task that will use this buffer
diff --git a/trunk/net/sunrpc/sunrpc.h b/trunk/net/sunrpc/sunrpc.h
index 5d9dd742264b..13171e63f51b 100644
--- a/trunk/net/sunrpc/sunrpc.h
+++ b/trunk/net/sunrpc/sunrpc.h
@@ -27,6 +27,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _NET_SUNRPC_SUNRPC_H
 #define _NET_SUNRPC_SUNRPC_H
 
+#include <linux/net.h>
+
+/*
+ * Header for dynamically allocated rpc buffers.
+ */
+struct rpc_buffer {
+	size_t	len;
+	char	data[];
+};
+
 static inline int rpc_reply_expected(struct rpc_task *task)
 {
 	return (task->tk_msg.rpc_proc != NULL) &&