From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Mon, 31 May 2010 23:06:39 +0000 (-0400)
Subject: nfsd4: fix deleg leak on callback error
X-Git-Tag: v2.6.36-rc1~496^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac94bf582529343bb7f354d0eef6dc4e566bbbd5;p=thirdparty%2Fkernel%2Flinux.git

nfsd4: fix deleg leak on callback error

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 874a56a0801c8..a4686326b5aef 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;