SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
3d39c691ff
commit
4011cd9788
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue