]> git.openfabrics.org - ~emulex/for-vlad/old/compat-rdma.git/commitdiff
NFSRDMA: fix client connect crash with RHEL/SLES backports.
authorSteve Wise <swise@opengridcomputing.com>
Wed, 2 Apr 2014 20:01:30 +0000 (15:01 -0500)
committerSteve Wise <swise@opengridcomputing.com>
Wed, 2 Apr 2014 20:01:30 +0000 (15:01 -0500)
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>
patches/0029-nfsrdma-backport-for-xprt-rdma-connect.patch [new file with mode: 0644]

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 (file)
index 0000000..3e0430b
--- /dev/null
@@ -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) {