From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Apr 2013 19:40:40 +0000 (-0400)
Subject: Merge branch 'rpcsec_gss-from_cel' into linux-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd1d421abcaae1b84ba377ea4c33bba31d654199;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
  ...
---

bd1d421abcaae1b84ba377ea4c33bba31d654199
diff --cc fs/nfs/nfs4client.c
index f4d4d4ec6bf7,a4f2100fd9c2..c2b069e25819
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@@ -198,10 -198,10 +198,12 @@@ struct nfs_client *nfs4_init_client(str
  	/* Check NFS protocol revision and initialize RPC op vector */
  	clp->rpc_ops = &nfs_v4_clientops;
  
 +	if (clp->cl_minorversion != 0)
 +		__set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
  	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
- 	error = nfs_create_rpc_client(clp, timeparms, authflavour);
+ 	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;