Hi Vlad. Please apply the attached patches to compat-rdma. Thanks.
-jeff
>From 157b0a91ae127f710606bba550a6983619be3519 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Becker <jeffrey.c.bec...@nasa.gov>
Date: Wed, 19 Feb 2014 15:42:08 -0800
Subject: [PATCH 1/2] NFSRDMA: SLES11sp3 backport
Signed-off-by: Jeff Becker <jeffrey.c.bec...@nasa.gov>
---
patches/0024-nfsrdma-backport-for-SLES11sp3.patch | 42 +++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
create mode 100644 patches/0024-nfsrdma-backport-for-SLES11sp3.patch
diff --git a/patches/0024-nfsrdma-backport-for-SLES11sp3.patch b/patches/0024-nfsrdma-backport-for-SLES11sp3.patch
new file mode 100644
index 0000000..228b9e0
--- /dev/null
+++ b/patches/0024-nfsrdma-backport-for-SLES11sp3.patch
@@ -0,0 +1,42 @@
+diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
+index 285dc08..ab74500 100644
+--- a/net/sunrpc/xprtrdma/transport.c
++++ b/net/sunrpc/xprtrdma/transport.c
+@@ -279,7 +281,9 @@ xprt_setup_rdma(struct xprt_create *args)
+ }
+
+ xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ xprt_rdma_slot_table_entries,
++#endif
+ xprt_rdma_slot_table_entries);
+ if (xprt == NULL) {
+ dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
+@@ -448,8 +452,15 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
+ }
+
+ static int
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ 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))
++ struct rpc_xprt *xprt = task->tk_xprt;
++#endif
+ struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
+ int credits = atomic_read(&r_xprt->rx_buf.rb_credits);
+
+@@ -461,7 +472,11 @@ xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
+ 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))
+ return xprt_reserve_xprt_cong(xprt, task);
++#else
++ return xprt_reserve_xprt_cong(task);
++#endif
+ }
+
+ /*
--
1.7.1
>From 54a4e0b324d63d41c95b3d25709dc66c4c709cf0 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Becker <jeffrey.c.bec...@nasa.gov>
Date: Thu, 20 Feb 2014 09:51:06 -0800
Subject: [PATCH 2/2] NFSRDMA: Renumber SLES11sp3 patch
Signed-off-by: Jeff Becker <jeffrey.c.bec...@nasa.gov>
---
patches/0024-nfsrdma-backport-for-SLES11sp3.patch | 42 ---------------------
patches/0025-nfsrdma-backport-for-SLES11sp3.patch | 42 +++++++++++++++++++++
2 files changed, 42 insertions(+), 42 deletions(-)
delete mode 100644 patches/0024-nfsrdma-backport-for-SLES11sp3.patch
create mode 100644 patches/0025-nfsrdma-backport-for-SLES11sp3.patch
diff --git a/patches/0024-nfsrdma-backport-for-SLES11sp3.patch b/patches/0024-nfsrdma-backport-for-SLES11sp3.patch
deleted file mode 100644
index 228b9e0..0000000
--- a/patches/0024-nfsrdma-backport-for-SLES11sp3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
-index 285dc08..ab74500 100644
---- a/net/sunrpc/xprtrdma/transport.c
-+++ b/net/sunrpc/xprtrdma/transport.c
-@@ -279,7 +281,9 @@ xprt_setup_rdma(struct xprt_create *args)
- }
-
- xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
- xprt_rdma_slot_table_entries,
-+#endif
- xprt_rdma_slot_table_entries);
- if (xprt == NULL) {
- dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
-@@ -448,8 +452,15 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
- }
-
- static int
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
- 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))
-+ struct rpc_xprt *xprt = task->tk_xprt;
-+#endif
- struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
- int credits = atomic_read(&r_xprt->rx_buf.rb_credits);
-
-@@ -461,7 +472,11 @@ xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
- 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))
- return xprt_reserve_xprt_cong(xprt, task);
-+#else
-+ return xprt_reserve_xprt_cong(task);
-+#endif
- }
-
- /*
diff --git a/patches/0025-nfsrdma-backport-for-SLES11sp3.patch b/patches/0025-nfsrdma-backport-for-SLES11sp3.patch
new file mode 100644
index 0000000..228b9e0
--- /dev/null
+++ b/patches/0025-nfsrdma-backport-for-SLES11sp3.patch
@@ -0,0 +1,42 @@
+diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
+index 285dc08..ab74500 100644
+--- a/net/sunrpc/xprtrdma/transport.c
++++ b/net/sunrpc/xprtrdma/transport.c
+@@ -279,7 +281,9 @@ xprt_setup_rdma(struct xprt_create *args)
+ }
+
+ xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ xprt_rdma_slot_table_entries,
++#endif
+ xprt_rdma_slot_table_entries);
+ if (xprt == NULL) {
+ dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
+@@ -448,8 +452,15 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
+ }
+
+ static int
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ 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))
++ struct rpc_xprt *xprt = task->tk_xprt;
++#endif
+ struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
+ int credits = atomic_read(&r_xprt->rx_buf.rb_credits);
+
+@@ -461,7 +472,11 @@ xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
+ 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))
+ return xprt_reserve_xprt_cong(xprt, task);
++#else
++ return xprt_reserve_xprt_cong(task);
++#endif
+ }
+
+ /*
--
1.7.1
_______________________________________________
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
