From 39fa08284bd197adeaf978fda39db17ec90aae88 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 27 Jan 2011 14:55:39 -0500
Subject: [PATCH] --- yaml --- r: 232697 b: refs/heads/master c:
 e00b8a24041f37e56b4b8415ce4eba1cbc238065 h: refs/heads/master i:   232695:
 4ead36cc8088e9ef2cef9a1fed1442cd350f2636 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfs/delegation.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5043d3f0db18..bb03da0e23cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7a360b05b5430ac1d75dc7d53c586ada60a05cb
+refs/heads/master: e00b8a24041f37e56b4b8415ce4eba1cbc238065
diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c
index 364e4328f392..bbbc6bf5cb2e 100644
--- a/trunk/fs/nfs/delegation.c
+++ b/trunk/fs/nfs/delegation.c
@@ -23,8 +23,6 @@
 
 static void nfs_do_free_delegation(struct nfs_delegation *delegation)
 {
-	if (delegation->cred)
-		put_rpccred(delegation->cred);
 	kfree(delegation);
 }
 
@@ -37,6 +35,10 @@ static void nfs_free_delegation_callback(struct rcu_head *head)
 
 static void nfs_free_delegation(struct nfs_delegation *delegation)
 {
+	if (delegation->cred) {
+		put_rpccred(delegation->cred);
+		delegation->cred = NULL;
+	}
 	call_rcu(&delegation->rcu, nfs_free_delegation_callback);
 }