From: Steve Wise <swise@opengridcomputing.com>
Date: Wed, 2 Apr 2014 20:01:30 +0000 (-0500)
Subject: NFSRDMA: fix client connect crash with RHEL/SLES backports.
X-Git-Tag: vofed-3.12~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3739f3758ab794fa1800bc364e6c00fe5a11d917;p=~emulex%2Ffor-vlad%2Fold%2Fcompat-rdma.git

NFSRDMA: fix client connect crash with RHEL/SLES backports.

xprt_rdma_connect() takes 1 parameter in sles11sp3 and rhel6.5 kernels.
Yet the OFED version takes 2 parameters.  Need more backport magic...

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
---

diff --git a/patches/0029-nfsrdma-backport-for-xprt-rdma-connect.patch b/patches/0029-nfsrdma-backport-for-xprt-rdma-connect.patch
new file mode 100644
index 0000000..3e0430b
--- /dev/null
+++ b/patches/0029-nfsrdma-backport-for-xprt-rdma-connect.patch
@@ -0,0 +1,18 @@
+--- a/net/sunrpc/xprtrdma/transport.c	2014-04-02 14:59:56.833964877 -0500
++++ b/net/sunrpc/xprtrdma/transport.c	2014-04-02 14:58:40.177170944 -0500
+@@ -431,8 +431,15 @@ xprt_rdma_set_port(struct rpc_xprt *xprt
+ }
+ 
+ static void
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
++xprt_rdma_connect(struct rpc_task *task)
++#else
+ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
++#endif
+ {
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
++	struct rpc_xprt *xprt = task->tk_xprt;
++#endif
+ 	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
+ 
+ 	if (r_xprt->rx_ep.rep_connected != 0) {