lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2007-08-07 15:33:01 -04:00
parent 3d39c691ff
commit 4011cd9788
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/sunrpc/cache.c
View File

@@ -371,8 +371,7 @@ int cache_unregister(struct cache_detail *cd)
} }
if (list_empty(&cache_list)) { if (list_empty(&cache_list)) {
/* module must be being unloaded so its safe to kill the worker */ /* module must be being unloaded so its safe to kill the worker */
cancel_delayed_work(&cache_cleaner); cancel_delayed_work_sync(&cache_cleaner);
flush_scheduled_work();
} }
return 0; return 0;
} }

3
net/sunrpc/rpc_pipe.c
View File

@@ -132,8 +132,7 @@ rpc_close_pipes(struct inode *inode)
rpci->nwriters = 0; rpci->nwriters = 0;
if (ops->release_pipe) if (ops->release_pipe)
ops->release_pipe(inode); ops->release_pipe(inode);
cancel_delayed_work(&rpci->queue_timeout); cancel_delayed_work_sync(&rpci->queue_timeout);
flush_workqueue(rpciod_workqueue);
} }
rpc_inode_setowner(inode, NULL); rpc_inode_setowner(inode, NULL);
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);