From dc5cd8a409a63407302a5c167d2563e6596f33eb Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 7 Aug 2007 15:33:01 -0400
Subject: [PATCH] --- yaml --- r: 63831 b: refs/heads/master c:
 4011cd97886dd04b90fef8b671b9936cd39ab983 h: refs/heads/master i:   63829:
 4332ac64eb81fddbdf3715cc252e29e49baba850   63827:
 031039f044be084daca60b3e4eb8f17ee9c69a03   63823:
 2893a6e218bebd19309fd4542c11be1751b9c131 v: v3

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

diff --git a/[refs] b/[refs]
index 4f0a7c0087fc..d6409811300c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d39c691ff486142dd9aaeac12f553f4476b7a62
+refs/heads/master: 4011cd97886dd04b90fef8b671b9936cd39ab983
diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c
index 01c3c4105204..ebe344f34d1a 100644
--- a/trunk/net/sunrpc/cache.c
+++ b/trunk/net/sunrpc/cache.c
@@ -371,8 +371,7 @@ int cache_unregister(struct cache_detail *cd)
 	}
 	if (list_empty(&cache_list)) {
 		/* module must be being unloaded so its safe to kill the worker */
-		cancel_delayed_work(&cache_cleaner);
-		flush_scheduled_work();
+		cancel_delayed_work_sync(&cache_cleaner);
 	}
 	return 0;
 }
diff --git a/trunk/net/sunrpc/rpc_pipe.c b/trunk/net/sunrpc/rpc_pipe.c
index 650af064ff8d..669e12a4ed18 100644
--- a/trunk/net/sunrpc/rpc_pipe.c
+++ b/trunk/net/sunrpc/rpc_pipe.c
@@ -132,8 +132,7 @@ rpc_close_pipes(struct inode *inode)
 		rpci->nwriters = 0;
 		if (ops->release_pipe)
 			ops->release_pipe(inode);
-		cancel_delayed_work(&rpci->queue_timeout);
-		flush_workqueue(rpciod_workqueue);
+		cancel_delayed_work_sync(&rpci->queue_timeout);
 	}
 	rpc_inode_setowner(inode, NULL);
 	mutex_unlock(&inode->i_mutex);