From: Steve Wise <swise@opengridcomputing.com>
Date: Mon, 31 Mar 2014 20:42:58 +0000 (-0500)
Subject: Fix NFSRDMA SLES11sp3 backport patch.
X-Git-Tag: vofed-3.12~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e960c5a5b73b63cd9335c1bed962c7196ed8e0e4;p=~tnikolova%2Fcompat-rdma%2F.git

Fix NFSRDMA SLES11sp3 backport patch.

The SLES11SP3 patch breaks RHEL6.5 functionality.

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

diff --git a/patches/0026-nfsrdma-Backport-for-sles11sp3.patch b/patches/0026-nfsrdma-Backport-for-sles11sp3.patch
index 350b98a..84bb97e 100644
--- a/patches/0026-nfsrdma-Backport-for-sles11sp3.patch
+++ b/patches/0026-nfsrdma-Backport-for-sles11sp3.patch
@@ -24,13 +24,13 @@ index xxxxxxx..xxxxxxx xxxxxx
  }
  
  static int
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) || defined (CONFIG_COMPAT_XPRT_RESERVE_XPRT_CONG_2PARAMS)
  xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
 +#else
 +xprt_rdma_reserve_xprt(struct rpc_task *task)
 +#endif
  {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) && !defined (CONFIG_COMPAT_XPRT_RESERVE_XPRT_CONG_2PARAMS)
 +	struct rpc_xprt *xprt = task->tk_xprt;
 +#endif
  	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);