diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
| commit | d3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (patch) | |
| tree | f0862d1905a599cdbad86fcc8816d86a6f33459f /fs/nfs/inode.c | |
| parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 5c7325c5c5e6..6fa01aea2488 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -685,7 +685,10 @@ 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); - nfs_sb_deactive(sb); + if (is_sync) + nfs_sb_deactive(sb); + else + nfs_sb_deactive_async(sb); kfree(ctx->mdsthreshold); kfree(ctx); } |