1 files changed, 6 insertions, 1 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index c8e729deb4f7..6f0470667f95 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2093,10 +2093,15 @@ again:
                         nfs4_root_machine_cred(clp);
                         goto again;
                 }
-                if (i > 2)
+                if (clnt->cl_auth->au_flavor == RPC_AUTH_UNIX)
                         break;
         case -NFS4ERR_CLID_INUSE:
         case -NFS4ERR_WRONGSEC:
+                /* No point in retrying if we already used RPC_AUTH_UNIX */
+                if (clnt->cl_auth->au_flavor == RPC_AUTH_UNIX) {
+                        status = -EPERM;
+                        break;
+                }
                 clnt = rpc_clone_client_set_auth(clnt, RPC_AUTH_UNIX);
                 if (IS_ERR(clnt)) {
                         status = PTR_ERR(clnt);