diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-01-11 22:39:51 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-01 16:13:48 +0100 |
| commit | 322b2b9032f4beba6f1c4158852a5a5b9ab841d7 (patch) | |
| tree | 01e0d696fc636318c63543b46d988876ff329ee4 /fs/nfs/unlink.c | |
| parent | SUNRPC: Nuke the tk_xprt macro (diff) | |
| download | linux-322b2b9032f4beba6f1c4158852a5a5b9ab841d7.tar.xz linux-322b2b9032f4beba6f1c4158852a5a5b9ab841d7.zip | |
Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"
This reverts commit 324d003b0cd82151adbaecefef57b73f7959a469.
The deadlock turned out to be caused by a workqueue limitation that has
now been worked around in the RPC code (see comment in rpc_free_task).
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 3f79c77153b8..13cea637eff8 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_async(sb); + nfs_sb_deactive(sb); } static void nfs_unlink_prepare(struct rpc_task *task, void *calldata) |