Merge branch 'rpcsec_gss-from_cel' into linux-next

* rpcsec_gss-from_cel: (21 commits)
  NFS: Retry SETCLIENTID with AUTH_SYS instead of AUTH_NONE
  NFSv4: Don't clear the machine cred when client establish returns EACCES
  NFSv4: Fix issues in nfs4_discover_server_trunking
  NFSv4: Fix the fallback to AUTH_NULL if krb5i is not available
  NFS: Use server-recommended security flavor by default (NFSv3)
  SUNRPC: Don't recognize RPC_AUTH_MAXFLAVOR
  NFS: Use "krb5i" to establish NFSv4 state whenever possible
  NFS: Try AUTH_UNIX when PUTROOTFH gets NFS4ERR_WRONGSEC
  NFS: Use static list of security flavors during root FH lookup recovery
  NFS: Avoid PUTROOTFH when managing leases
  NFS: Clean up nfs4_proc_get_rootfh
  NFS: Handle missing rpc.gssd when looking up root FH
  SUNRPC: Remove EXPORT_SYMBOL_GPL() from GSS mech switch
  SUNRPC: Make gss_mech_get() static
  SUNRPC: Refactor nfsd4_do_encode_secinfo()
  SUNRPC: Consider qop when looking up pseudoflavors
  SUNRPC: Load GSS kernel module by OID
  SUNRPC: Introduce rpcauth_get_pseudoflavor()
  SUNRPC: Define rpcsec_gss_info structure
  NFS: Remove unneeded forward declaration
  ...

1 files changed, 11 insertions, 49 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index b7796950eceb..7a74ea64bf54 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -154,18 +154,6 @@ struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp)
         return cred;
 }
 
-static void nfs4_clear_machine_cred(struct nfs_client *clp)
-{
-        struct rpc_cred *cred;
-
-        spin_lock(&clp->cl_lock);
-        cred = clp->cl_machine_cred;
-        clp->cl_machine_cred = NULL;
-        spin_unlock(&clp->cl_lock);
-        if (cred != NULL)
-                put_rpccred(cred);
-}
-
 static struct rpc_cred *
 nfs4_get_renew_cred_server_locked(struct nfs_server *server)
 {
@@ -1776,10 +1764,6 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)
                 clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
                 return -EPERM;
         case -EACCES:
-                if (clp->cl_machine_cred == NULL)
-                        return -EACCES;
-                /* Handle case where the user hasn't set up machine creds */
-                nfs4_clear_machine_cred(clp);
         case -NFS4ERR_DELAY:
         case -ETIMEDOUT:
         case -EAGAIN:
@@ -1874,31 +1858,18 @@ int nfs4_discover_server_trunking(struct nfs_client *clp,
 {
         const struct nfs4_state_recovery_ops *ops =
                                 clp->cl_mvops->reboot_recovery_ops;
-        rpc_authflavor_t *flavors, flav, save;
         struct rpc_clnt *clnt;
         struct rpc_cred *cred;
-        int i, len, status;
+        int i, status;
 
         dprintk("NFS: %s: testing '%s'\n", __func__, clp->cl_hostname);
 
-        len = NFS_MAX_SECFLAVORS;
-        flavors = kcalloc(len, sizeof(*flavors), GFP_KERNEL);
-        if (flavors == NULL) {
-                status = -ENOMEM;
-                goto out;
-        }
-        len = rpcauth_list_flavors(flavors, len);
-        if (len < 0) {
-                status = len;
-                goto out_free;
-        }
         clnt = clp->cl_rpcclient;
-        save = clnt->cl_auth->au_flavor;
         i = 0;
 
         mutex_lock(&nfs_clid_init_mutex);
-        status  = -ENOENT;
 again:
+        status  = -ENOENT;
         cred = ops->get_clid_cred(clp);
         if (cred == NULL)
                 goto out_unlock;
@@ -1908,12 +1879,6 @@ again:
         switch (status) {
         case 0:
                 break;
-
-        case -EACCES:
-                if (clp->cl_machine_cred == NULL)
-                        break;
-                /* Handle case where the user hasn't set up machine creds */
-                nfs4_clear_machine_cred(clp);
         case -NFS4ERR_DELAY:
         case -ETIMEDOUT:
         case -EAGAIN:
@@ -1922,17 +1887,12 @@ again:
                 dprintk("NFS: %s after status %d, retrying\n",
                         __func__, status);
                 goto again;
-
+        case -EACCES:
+                if (i++)
+                        break;
         case -NFS4ERR_CLID_INUSE:
         case -NFS4ERR_WRONGSEC:
-                status = -EPERM;
-                if (i >= len)
-                        break;
-
-                flav = flavors[i++];
-                if (flav == save)
-                        flav = flavors[i++];
-                clnt = rpc_clone_client_set_auth(clnt, flav);
+                clnt = rpc_clone_client_set_auth(clnt, RPC_AUTH_UNIX);
                 if (IS_ERR(clnt)) {
                         status = PTR_ERR(clnt);
                         break;
@@ -1948,13 +1908,15 @@ again:
         case -NFS4ERR_NOT_SAME: /* FixMe: implement recovery
                                  * in nfs4_exchange_id */
                 status = -EKEYEXPIRED;
+                break;
+        default:
+                pr_warn("NFS: %s unhandled error %d. Exiting with error EIO\n",
+                                __func__, status);
+                status = -EIO;
         }
 
 out_unlock:
         mutex_unlock(&nfs_clid_init_mutex);
-out_free:
-        kfree(flavors);
-out:
         dprintk("NFS: %s: status = %d\n", __func__, status);
         return status;
 }