diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-01-11 16:39:51 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-01 10:13:48 -0500 |
| commit | 322b2b9032f4beba6f1c4158852a5a5b9ab841d7 (patch) | |
| tree | 01e0d696fc636318c63543b46d988876ff329ee4 /fs/nfs/inode.c | |
| parent | 77102893ae685270c1774fa8b7eead6ad93c838d (diff) | |
| download | blackbird-op-linux-322b2b9032f4beba6f1c4158852a5a5b9ab841d7.tar.gz blackbird-op-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/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index ebeb94ce1b0b..6acc73c80d7f 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -694,10 +694,7 @@ static void __put_nfs_open_context(struct nfs_open_context *ctx, int is_sync) if (ctx->cred != NULL) put_rpccred(ctx->cred); dput(ctx->dentry); - if (is_sync) - nfs_sb_deactive(sb); - else - nfs_sb_deactive_async(sb); + nfs_sb_deactive(sb); kfree(ctx->mdsthreshold); kfree(ctx); } |
