diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-08-07 15:33:01 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-08-07 16:13:01 -0400 |
| commit | 4011cd97886dd04b90fef8b671b9936cd39ab983 (patch) | |
| tree | 8933e97a2215498fd096502005dbf763527ded2a | |
| parent | 3d39c691ff486142dd9aaeac12f553f4476b7a62 (diff) | |
| download | blackbird-op-linux-4011cd97886dd04b90fef8b671b9936cd39ab983.tar.gz blackbird-op-linux-4011cd97886dd04b90fef8b671b9936cd39ab983.zip | |
SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | net/sunrpc/cache.c | 3 | ||||
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 01c3c4105204..ebe344f34d1a 100644 --- a/net/sunrpc/cache.c +++ b/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/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 650af064ff8d..669e12a4ed18 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/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); |
