diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2012-10-30 17:01:39 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-31 16:26:26 -0400 |
| commit | 324d003b0cd82151adbaecefef57b73f7959a469 (patch) | |
| tree | 9876567e78d72999d47feaf1fc957b3615a18c31 /fs/nfs/unlink.c | |
| parent | 97a54868262da1629a3e65121e65b8e8c4419d9f (diff) | |
| download | linux-stable-324d003b0cd82151adbaecefef57b73f7959a469.tar.gz linux-stable-324d003b0cd82151adbaecefef57b73f7959a469.tar.bz2 linux-stable-324d003b0cd82151adbaecefef57b73f7959a469.zip | |
NFS: add nfs_sb_deactive_async to avoid deadlock
Use nfs_sb_deactive_async instead of nfs_sb_deactive when in a workqueue
context. This avoids a deadlock where rpc_shutdown_client loops forever
in a workqueue kworker context, trying to kill all RPC tasks associated with
the client, while one or more of these tasks have already been assigned to the
same kworker (and will never run rpc_exit_task).
This approach is needed because RPC tasks that have already been assigned
to a kworker by queue_work cannot be canceled, as explained in the comment
for workqueue.c:insert_wq_barrier.
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
[Trond: add module_get/put.]
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/unlink.c')
| -rw-r--r-- | fs/nfs/unlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 13cea637eff8..3f79c77153b8 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -95,7 +95,7 @@ static void nfs_async_unlink_release(void *calldata) nfs_dec_sillycount(data->dir); nfs_free_unlinkdata(data); - nfs_sb_deactive(sb); + nfs_sb_deactive_async(sb); } static void nfs_unlink_prepare(struct rpc_task *task, void *calldata) |