4 files changed, 5 insertions, 2 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index f5a7f7f9cd59..1d09289c8f0e 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -786,6 +786,7 @@ static int nfs_init_server(struct nfs_server *server,
                 goto error;
 
         server->port = data->nfs_server.port;
+        server->auth_info = data->auth_info;
 
         error = nfs_init_server_rpcclient(server, &timeparms,
                                           data->selected_flavor);
@@ -929,6 +930,7 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour
         target->acdirmax = source->acdirmax;
         target->caps = source->caps;
         target->options = source->options;
+        target->auth_info = source->auth_info;
 }
 EXPORT_SYMBOL_GPL(nfs_server_copy_userdata);
 
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index d65090e5d00f..04131c837f27 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -962,6 +962,7 @@ static int nfs4_init_server(struct nfs_server *server,
         /* Initialise the client representation from the mount data */
         server->flags = data->flags;
         server->options = data->options;
+        server->auth_info = data->auth_info;
 
         if (data->auth_info.flavor_len >= 1)
                 data->selected_flavor = data->auth_info.flavors[0];
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b87744fb9dcd..de1e5e89c93d 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2187,8 +2187,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
         data->wsize = nfss->wsize;
         data->retrans = nfss->client->cl_timeout->to_retries;
         data->selected_flavor = nfss->client->cl_auth->au_flavor;
-        data->auth_info.flavors[0] = nfss->client->cl_auth->au_flavor;
-        data->auth_info.flavor_len = 1;
+        data->auth_info = nfss->auth_info;
         data->acregmin = nfss->acregmin / HZ;
         data->acregmax = nfss->acregmax / HZ;
         data->acdirmin = nfss->acdirmin / HZ;
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 186ec4969313..1150ea41b626 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -151,6 +151,7 @@ struct nfs_server {
         unsigned long           mount_time;     /* when this fs was mounted */
         struct super_block      *super;         /* VFS super block */
         dev_t                   s_dev;          /* superblock dev numbers */
+        struct nfs_auth_info    auth_info;      /* parsed auth flavors */
 
 #ifdef CONFIG_NFS_FSCACHE
         struct nfs_fscache_key  *fscache_key;   /* unique key for superblock */