1 files changed, 10 insertions, 0 deletions

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index b8cedced50c9..1150ea41b626 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -41,6 +41,7 @@ struct nfs_client {
 #define NFS_CS_DISCRTRY         1               /* - disconnect on RPC retry */
 #define NFS_CS_MIGRATION        2               /* - transparent state migr */
 #define NFS_CS_INFINITE_SLOTS   3               /* - don't limit TCP slots */
+#define NFS_CS_NO_RETRANS_TIMEOUT       4       /* - Disable retransmit timeouts */
         struct sockaddr_storage cl_addr;        /* server identifier */
         size_t                  cl_addrlen;
         char *                  cl_hostname;    /* hostname of server */
@@ -78,6 +79,7 @@ struct nfs_client {
         char                    cl_ipaddr[48];
         u32                     cl_cb_ident;    /* v4.0 callback identifier */
         const struct nfs4_minor_version_ops *cl_mvops;
+        unsigned long           cl_mig_gen;
 
         /* NFSv4.0 transport blocking */
         struct nfs4_slot_table  *cl_slot_tbl;
@@ -147,7 +149,9 @@ struct nfs_server {
         __u64                   maxfilesize;    /* maximum file size */
         struct timespec         time_delta;     /* smallest time granularity */
         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 */
@@ -187,6 +191,12 @@ struct nfs_server {
         struct list_head        state_owners_lru;
         struct list_head        layouts;
         struct list_head        delegations;
+
+        unsigned long           mig_gen;
+        unsigned long           mig_status;
+#define NFS_MIG_IN_TRANSITION           (1)
+#define NFS_MIG_FAILED                  (2)
+
         void (*destroy)(struct nfs_server *);
 
         atomic_t active; /* Keep trace of any activity to this server */