Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes:
 - Stable fix for data corruption when retransmitting O_DIRECT writes
 - Stable fix for a deep recursion/stack overflow bug in rpc_release_client
 - Stable fix for infinite looping when mounting a NFSv4.x volume
 - Fix a typo in the nfs mount option parser
 - Allow pNFS layouts to be compiled into the kernel when NFSv4.1 is

* tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix pnfs Kconfig defaults
  NFS: correctly report misuse of "migration" mount option.
  nfs: don't retry detect_trunking with RPC_AUTH_UNIX more than once
  SUNRPC: Avoid deep recursion in rpc_release_client
  SUNRPC: Fix a data corruption issue when retransmitting RPC calls

3 files changed, 10 insertions, 5 deletions

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 38c1768b4142..3dece03f2fc8 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -116,17 +116,17 @@ config NFS_V4_2
 config PNFS_FILE_LAYOUT
         tristate
         depends on NFS_V4_1
-        default m
+        default NFS_V4
 
 config PNFS_BLOCK
         tristate
         depends on NFS_V4_1 && BLK_DEV_DM
-        default m
+        default NFS_V4
 
 config PNFS_OBJLAYOUT
         tristate
         depends on NFS_V4_1 && SCSI_OSD_ULD
-        default m
+        default NFS_V4
 
 config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
         string "NFSv4.1 Implementation ID Domain"
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 74a7e12e10df..059c01b67a71 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);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 317d6fc2160e..910ed906eb82 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1614,7 +1614,7 @@ static int nfs_parse_mount_options(char *raw,
                 goto out_minorversion_mismatch;
 
         if (mnt->options & NFS_OPTION_MIGRATION &&
-            mnt->version != 4 && mnt->minorversion != 0)
+            (mnt->version != 4 || mnt->minorversion != 0))
                 goto out_migration_misuse;
 
         /*