---

yaml --- r: 294564 b: refs/heads/master c: e49a29b h: refs/heads/master v: v3
git-mirror · Mar 17, 2012 · 3201299 · 3201299
1 parent b64a0dd
commit 3201299
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9390f42546339cf111edd23c16d6cf74ca41974c
+refs/heads/master: e49a29bd0eacce9d4956c4daf777a330115b369d
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
@@ -146,13 +146,20 @@ struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp)
 	struct rpc_cred *cred = NULL;
 	struct nfs_server *server;
 
+	/* Use machine credentials if available */
+	cred = nfs4_get_machine_cred_locked(clp);
+	if (cred != NULL)
+		goto out;
+
 	rcu_read_lock();
 	list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {
 		cred = nfs4_get_renew_cred_server_locked(server);
 		if (cred != NULL)
 			break;
 	}
 	rcu_read_unlock();
+
+out:
 	return cred;
 }