From 1fcdcbdc03d4b91d0fb39730e00f0f17ec5fae6b Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 22 Jun 2005 17:16:28 +0000
Subject: [PATCH] --- yaml --- r: 2793 b: refs/heads/master c:
 0f9dc2b16884bb5957d010ed8e9114e771a05916 h: refs/heads/master i:   2791:
 3454994085c58086f2518c1118196d32d55a6f41 v: v3

---
 [refs]                  | 2 +-
 trunk/net/sunrpc/xprt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1bffb4aacdc6..f151403ab0d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14b218a8e4f110206c46e586a3da372f665631e7
+refs/heads/master: 0f9dc2b16884bb5957d010ed8e9114e771a05916
diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c
index ef941e7de8bf..a74a1289113e 100644
--- a/trunk/net/sunrpc/xprt.c
+++ b/trunk/net/sunrpc/xprt.c
@@ -1240,6 +1240,8 @@ xprt_transmit(struct rpc_task *task)
 			list_add_tail(&req->rq_list, &xprt->recv);
 			spin_unlock_bh(&xprt->sock_lock);
 			xprt_reset_majortimeo(req);
+			/* Turn off autodisconnect */
+			del_singleshot_timer_sync(&xprt->timer);
 		}
 	} else if (!req->rq_bytes_sent)
 		return;
@@ -1370,8 +1372,6 @@ xprt_reserve(struct rpc_task *task)
 		spin_lock(&xprt->xprt_lock);
 		do_xprt_reserve(task);
 		spin_unlock(&xprt->xprt_lock);
-		if (task->tk_rqstp)
-			del_timer_sync(&xprt->timer);
 	}
 }