>From b7f948e471f3fe311c35dd9dccb7f6a68d1ac762 Mon Sep 17 00:00:00 2001
From: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
Date: Thu, 21 Jul 2011 11:50:44 -0700
Subject: [PATCH 5/5] Remove SUNRPC patch that no longer applies.

Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
---
 .../fixes/nfsrdma_zz_1000_reestablish_to_fix.patch |   34 --------------------
 1 files changed, 0 insertions(+), 34 deletions(-)
 delete mode 100644 kernel_patches/fixes/nfsrdma_zz_1000_reestablish_to_fix.patch

diff --git a/kernel_patches/fixes/nfsrdma_zz_1000_reestablish_to_fix.patch b/kernel_patches/fixes/nfsrdma_zz_1000_reestablish_to_fix.patch
deleted file mode 100644
index 087e3f1..0000000
--- a/kernel_patches/fixes/nfsrdma_zz_1000_reestablish_to_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
-index e185961..92a5c42 100644
---- a/net/sunrpc/xprtsock.c
-+++ b/net/sunrpc/xprtsock.c
-@@ -818,6 +818,7 @@ static void xs_close(struct rpc_xprt *xprt)
- 	dprintk("RPC:       xs_close xprt %p\n", xprt);
- 
- 	xs_reset_transport(transport);
-+	xprt->reestablish_timeout = 0;
- 
- 	smp_mb__before_clear_bit();
- 	clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
-@@ -1146,6 +1147,12 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes)
- 	if (xprt->shutdown)
- 		goto out;
- 
-+	/* Any data means we had a useful conversation, so
-+	 * the we don't need to delay the next reconnect
-+	 */
-+	if (xprt->reestablish_timeout)
-+		xprt->reestablish_timeout = 0;
-+
- 	/* We use rd_desc to pass struct xprt to xs_tcp_data_recv */
- 	rd_desc.arg.data = xprt;
- 	do {
-@@ -1916,6 +1923,8 @@ static void xs_connect(struct rpc_task *task)
- 				   &transport->connect_worker,
- 				   xprt->reestablish_timeout);
- 		xprt->reestablish_timeout <<= 1;
-+		if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
-+			xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
- 		if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
- 			xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
- 	} else {
-- 
1.7.3.4

