aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-05-31 19:06:39 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-24 12:24:53 -0400
commitac94bf582529343bb7f354d0eef6dc4e566bbbd5 (patch)
treebc42a55d8231f0f64dff935301f473cd2494b1b7 /fs
parentec8acac84aea4245ae2cc999d56a68f0302cc847 (diff)
downloadkernel_samsung_tuna-ac94bf582529343bb7f354d0eef6dc4e566bbbd5.zip
kernel_samsung_tuna-ac94bf582529343bb7f354d0eef6dc4e566bbbd5.tar.gz
kernel_samsung_tuna-ac94bf582529343bb7f354d0eef6dc4e566bbbd5.tar.bz2
nfsd4: fix deleg leak on callback error
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4callback.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 874a56a..a468632 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -761,8 +761,10 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp)
.rpc_cred = callback_cred
};
- if (clnt == NULL)
+ if (clnt == NULL) {
+ nfs4_put_delegation(dp);
return; /* Client is shutting down; give up. */
+ }
args->args_op = dp;
msg.rpc_argp = args;