diff --git a/[refs] b/[refs]
index 725522f5c476..c87362649c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a49c3c7736a2e77931dabc5bc4a83fb4b2da013e
+refs/heads/master: 603c83da19cf42d0f94022ac2fa389a431e32b84
diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c
index af8b235d405d..11833f4caeaa 100644
--- a/trunk/fs/nfs/delegation.c
+++ b/trunk/fs/nfs/delegation.c
@@ -168,7 +168,8 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
 	spin_unlock(&inode->i_lock);
 
 	spin_unlock(&clp->cl_lock);
-	kfree(delegation);
+	if (delegation != NULL)
+		nfs_free_delegation(delegation);
 	return status;
 }