From dd60c469082521420f30b4c399ec5cc82559f55f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 4 Apr 2013 16:14:11 -0400
Subject: [PATCH] --- yaml --- r: 367335 b: refs/heads/master c:
 23631227a672de5e81e167c3178b39e9a50f6541 h: refs/heads/master i:   367333:
 cd08c8cdaf04b5fc37c99da67a1f60bfb8386250   367331:
 cd512664fda3c92cdce7322179ba084d04da7bf9   367327:
 5c9f32a2093efae9ddb5d79c25d60421df9d9309 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfs/nfs4client.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48ed6fb90146..7b967816de90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4580a92d44e2b21c2254fa5fef0f1bfb43c82318
+refs/heads/master: 23631227a672de5e81e167c3178b39e9a50f6541
diff --git a/trunk/fs/nfs/nfs4client.c b/trunk/fs/nfs/nfs4client.c
index bb9789ef1d49..a4f2100fd9c2 100644
--- a/trunk/fs/nfs/nfs4client.c
+++ b/trunk/fs/nfs/nfs4client.c
@@ -200,6 +200,8 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
 
 	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
 	error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
+	if (error == -EINVAL)
+		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_NULL);
 	if (error < 0)
 		goto error;