]> git.openfabrics.org - ~emulex/compat-rdma_3.12.git/commitdiff
Fixed nfsrdma compilation issue on RHEL6.4/5
authorVladimir Sokolovsky <vlad@mellanox.com>
Mon, 24 Feb 2014 16:46:45 +0000 (18:46 +0200)
committerVladimir Sokolovsky <vlad@mellanox.com>
Mon, 24 Feb 2014 17:01:21 +0000 (19:01 +0200)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
patches/0025-nfsrdma-backport-for-SLES11sp3.patch

index 228b9e0a6469264ff7564abfdb7ab683213cfdf5..c899937f8143286d03335b4b0d7b067d5c84ab34 100644 (file)
@@ -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);