From: Vladimir Sokolovsky Date: Mon, 24 Feb 2014 16:46:45 +0000 (+0200) Subject: Fixed nfsrdma compilation issue on RHEL6.4/5 X-Git-Tag: vofed-3.12~17 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b684d124099ef7df07bd5d1b2361d42a11477d5c;p=~emulex%2Fcompat-rdma_3.12.git Fixed nfsrdma compilation issue on RHEL6.4/5 Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0025-nfsrdma-backport-for-SLES11sp3.patch b/patches/0025-nfsrdma-backport-for-SLES11sp3.patch index 228b9e0..c899937 100644 --- a/patches/0025-nfsrdma-backport-for-SLES11sp3.patch +++ b/patches/0025-nfsrdma-backport-for-SLES11sp3.patch @@ -6,7 +6,7 @@ index 285dc08..ab74500 100644 } xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt), -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) || defined (CONFIG_COMPAT_XPRT_ALLOC_4PARAMS) xprt_rdma_slot_table_entries, +#endif xprt_rdma_slot_table_entries); @@ -32,7 +32,7 @@ index 285dc08..ab74500 100644 BUG_ON(r_xprt->rx_buf.rb_cwndscale <= 0); } xprt->cwnd = credits * r_xprt->rx_buf.rb_cwndscale; -+#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) return xprt_reserve_xprt_cong(xprt, task); +#else + return xprt_reserve_xprt_cong(task);