From facd5dc4e4fc58dda2feb7dd58174166ab2a47da Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Tue, 3 Aug 2010 17:22:20 -0400
Subject: [PATCH] --- yaml --- r: 206414 b: refs/heads/master c:
 c3ae62ae08bb0db3639d8c579e4ff0967d908199 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a62b680525f6..049a8b15fa3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a1ed08c6acea647b3f2aaebe0261f079e1be49
+refs/heads/master: c3ae62ae08bb0db3639d8c579e4ff0967d908199
diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c
index 70297836a191..970fb00f388c 100644
--- a/trunk/net/sunrpc/xprt.c
+++ b/trunk/net/sunrpc/xprt.c
@@ -1131,6 +1131,7 @@ static void xprt_destroy(struct kref *kref)
 	rpc_destroy_wait_queue(&xprt->sending);
 	rpc_destroy_wait_queue(&xprt->resend);
 	rpc_destroy_wait_queue(&xprt->backlog);
+	cancel_work_sync(&xprt->task_cleanup);
 	/*
 	 * Tear down transport state and free the rpc_xprt
 	 */