From 87f952ee8b77276a672e4e0b404cda18156d2b31 Mon Sep 17 00:00:00 2001
From: Namjae Jeon <linkinjeon@gmail.com>
Date: Wed, 29 Aug 2012 10:10:53 -0400
Subject: [PATCH] --- yaml --- r: 334061 b: refs/heads/master c:
 8c8651b8e2d2957e94c19bc72fd6b7cf9b47fce8 h: refs/heads/master i:   334059:
 c9e86912864ecb8d6a409bbea0c06df1a3c63213 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfsd/nfs4callback.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 31989f23fe0c..6b99ffeab108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef79859e04bd67638f72373bb5514211d6f6d5b3
+refs/heads/master: 8c8651b8e2d2957e94c19bc72fd6b7cf9b47fce8
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index 4c7bd35b1876..bdf29c96e4cd 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -1028,7 +1028,6 @@ void nfsd4_cb_recall(struct nfs4_delegation *dp)
 	cb->cb_msg.rpc_cred = callback_cred;
 
 	cb->cb_ops = &nfsd4_cb_recall_ops;
-	dp->dl_retries = 1;
 
 	INIT_LIST_HEAD(&cb->cb_per_client);
 	cb->cb_done = true;