NFS: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 867b5dcd3a40..97cfb143e09f 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -471,12 +471,14 @@ static int nfs_validate_mount_data(struct nfs_mount_data *data,
                                                 data->version);
                                 return -EINVAL;
                         }
-                        /* Fill in pseudoflavor for mount version < 5 */
-                        data->pseudoflavor = RPC_AUTH_UNIX;
                 case 5:
                         memset(data->context, 0, sizeof(data->context));
         }
 
+        /* Set the pseudoflavor */
+        if (!(data->flags & NFS_MOUNT_SECFLAVOUR))
+                data->pseudoflavor = RPC_AUTH_UNIX;
+
 #ifndef CONFIG_NFS_V3
         /* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */
         if (data->flags & NFS_MOUNT_VER3) {