2 files changed, 17 insertions, 0 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 874018113d0e..93dfd75aba7c 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -688,6 +688,16 @@ static int nfs_init_server(struct nfs_server *server,
         if (error < 0)
                 goto error;
 
+        /* Preserve the values of mount_server-related mount options */
+        if (data->mount_server.addrlen) {
+                memcpy(&server->mountd_address, &data->mount_server.address,
+                        data->mount_server.addrlen);
+                server->mountd_addrlen = data->mount_server.addrlen;
+        }
+        server->mountd_version = data->mount_server.version;
+        server->mountd_port = data->mount_server.port;
+        server->mountd_protocol = data->mount_server.protocol;
+
         server->namelen  = data->namlen;
         /* Create a client RPC handle for the NFSv3 ACL management interface */
         nfs_init_server_aclclient(server);
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 670e5c7222d0..ac7e4fb943ea 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -118,6 +118,13 @@ struct nfs_server {
 
         atomic_t active; /* Keep trace of any activity to this server */
         wait_queue_head_t active_wq;  /* Wait for any activity to stop  */
+
+        /* mountd-related mount options */
+        struct sockaddr_storage mountd_address;
+        size_t                  mountd_addrlen;
+        u32                     mountd_version;
+        unsigned short          mountd_port;
+        unsigned short          mountd_protocol;
 };
 
 /* Server capabilities */