>From ad145d3fbf9005391c8cb4eec57a97d337b90cc3 Mon Sep 17 00:00:00 2001
From: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
Date: Tue, 11 Oct 2011 11:14:13 -0700
Subject: [PATCH 2/4] NFSRDMA: pull some patches for RHEL6.1
 Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>

---
 ...a-headers-remove-sched.h-from-interrupt.h.patch |   23 ++++++++++++++
 ...dma-sunrpc-Clean-never-used-include-files.patch |   32 +++++++++++++++++++
 ...ull-net-argument-downto-svc_create_socket.patch |   33 ++++++++++++++++++++
 3 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 kernel_patches/backport/2.6.32-EL6.1/nfsrdma-headers-remove-sched.h-from-interrupt.h.patch
 create mode 100644 kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Clean-never-used-include-files.patch
 create mode 100644 kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Pull-net-argument-downto-svc_create_socket.patch

diff --git a/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-headers-remove-sched.h-from-interrupt.h.patch b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-headers-remove-sched.h-from-interrupt.h.patch
new file mode 100644
index 0000000..cb430ca
--- /dev/null
+++ b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-headers-remove-sched.h-from-interrupt.h.patch
@@ -0,0 +1,23 @@
+From d43c36dc6b357fa1806800f18aa30123c747a6d1 Mon Sep 17 00:00:00 2001
+From: Alexey Dobriyan <adobriyan@gmail.com>
+Date: Wed, 7 Oct 2009 17:09:06 +0400
+Subject: [PATCH] headers: remove sched.h from interrupt.h
+
+After m68k's task_thread_info() doesn't refer to current,
+it's possible to remove sched.h from interrupt.h and not break m68k!
+Many thanks to Heiko Carstens for allowing this.
+
+Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
+---
+diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
+index 0cf5e8c..3fa5751 100644
+--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
++++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
+@@ -42,6 +42,7 @@
+ #include <linux/sunrpc/svc_xprt.h>
+ #include <linux/sunrpc/debug.h>
+ #include <linux/sunrpc/rpc_rdma.h>
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <rdma/ib_verbs.h>
+ #include <rdma/rdma_cm.h>
diff --git a/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Clean-never-used-include-files.patch b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Clean-never-used-include-files.patch
new file mode 100644
index 0000000..8787238
--- /dev/null
+++ b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Clean-never-used-include-files.patch
@@ -0,0 +1,32 @@
+From a600ffcbb3743cf1296bee2a41d4824c719d7181 Mon Sep 17 00:00:00 2001
+From: Boaz Harrosh <bharrosh@panasas.com>
+Date: Thu, 3 Dec 2009 20:28:35 +0200
+Subject: [PATCH] sunrpc: Clean never used include files
+
+Remove include of two headers never used by this file.
+Doing so exposed a missing #include <linux/types.h> in
+include/linux/sunrpc/rpc_rdma.h.
+
+I did not see any other users dependency but if exist they
+should be fixed since these headers are totally irrelevant
+to here.
+
+Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
+Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
+---
+diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
+index 87b895d..b78f16b 100644
+--- a/include/linux/sunrpc/rpc_rdma.h
++++ b/include/linux/sunrpc/rpc_rdma.h
+@@ -40,6 +40,8 @@
+ #ifndef _LINUX_SUNRPC_RPC_RDMA_H
+ #define _LINUX_SUNRPC_RPC_RDMA_H
+ 
++#include <linux/types.h>
++
+ struct rpcrdma_segment {
+ 	__be32 rs_handle;	/* Registered memory handle */
+ 	__be32 rs_length;	/* Length of the chunk in bytes */
+-- 
+1.7.3.4
+
diff --git a/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Pull-net-argument-downto-svc_create_socket.patch b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Pull-net-argument-downto-svc_create_socket.patch
new file mode 100644
index 0000000..4ca1e81
--- /dev/null
+++ b/kernel_patches/backport/2.6.32-EL6.1/nfsrdma-sunrpc-Pull-net-argument-downto-svc_create_socket.patch
@@ -0,0 +1,33 @@
+From 62832c039eab9d03cd28a66427ce8276988f28b0 Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul@parallels.com>
+Date: Wed, 29 Sep 2010 16:04:18 +0400
+Subject: [PATCH] sunrpc: Pull net argument downto svc_create_socket
+
+After this the socket creation in it knows the context.
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+---
+diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
+index edea15a..950a206 100644
+--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
++++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
+@@ -52,6 +52,7 @@
+ #define RPCDBG_FACILITY	RPCDBG_SVCXPRT
+ 
+ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
++					struct net *net,
+ 					struct sockaddr *sa, int salen,
+ 					int flags);
+ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt);
+@@ -670,6 +671,7 @@ static int rdma_cma_handler(struct rdma_cm_id *cma_id,
+  * Create a listening RDMA service endpoint.
+  */
+ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
++					struct net *net,
+ 					struct sockaddr *sa, int salen,
+ 					int flags)
+ {
+-- 
+1.7.3.4
+
-- 
1.7.3.4

