Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"

This reverts commit 324d003b0c.

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>
This commit is contained in:
Trond Myklebust
2013-01-11 16:39:51 -05:00
parent 77102893ae
commit 322b2b9032
5 changed files with 3 additions and 56 deletions

View File

@@ -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);
}