diff --git a/[refs] b/[refs]
index 1a0e7ae19fe1..dfdee3a1de92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccdb357ccb77cc4cbe4f7abee9efd19957f0753a
+refs/heads/master: 8d75da8afd068fa58b35e69c7c8c46770d9e7a98
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index 8fa412ce8021..4bc22c763de7 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -525,6 +525,8 @@ static struct rpc_cred *callback_cred;
 
 int set_callback_cred(void)
 {
+	if (callback_cred)
+		return 0;
 	callback_cred = rpc_lookup_machine_cred();
 	if (!callback_cred)
 		return -ENOMEM;