1 files changed, 66 insertions, 0 deletions

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 65c2431ea32f..1051bebff1b0 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -24,7 +24,18 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 
+/* Hash tables for nfs4_clientid state */
+#define CLIENT_HASH_BITS                 4
+#define CLIENT_HASH_SIZE                (1 << CLIENT_HASH_BITS)
+#define CLIENT_HASH_MASK                (CLIENT_HASH_SIZE - 1)
+
+#define LOCKOWNER_INO_HASH_BITS         8
+#define LOCKOWNER_INO_HASH_SIZE         (1 << LOCKOWNER_INO_HASH_BITS)
+
+#define SESSION_HASH_SIZE       512
+
 struct cld_net;
+struct nfsd4_client_tracking_ops;
 
 struct nfsd_net {
         struct cld_net *cld_net;
@@ -38,7 +49,62 @@ struct nfsd_net {
         struct lock_manager nfsd4_manager;
         bool grace_ended;
         time_t boot_time;
+
+        /*
+         * reclaim_str_hashtbl[] holds known client info from previous reset/reboot
+         * used in reboot/reset lease grace period processing
+         *
+         * conf_id_hashtbl[], and conf_name_tree hold confirmed
+         * setclientid_confirmed info.
+         *
+         * unconf_str_hastbl[] and unconf_name_tree hold unconfirmed
+         * setclientid info.
+         */
+        struct list_head *reclaim_str_hashtbl;
+        int reclaim_str_hashtbl_size;
+        struct list_head *conf_id_hashtbl;
+        struct rb_root conf_name_tree;
+        struct list_head *unconf_id_hashtbl;
+        struct rb_root unconf_name_tree;
+        struct list_head *ownerstr_hashtbl;
+        struct list_head *lockowner_ino_hashtbl;
+        struct list_head *sessionid_hashtbl;
+        /*
+         * client_lru holds client queue ordered by nfs4_client.cl_time
+         * for lease renewal.
+         *
+         * close_lru holds (open) stateowner queue ordered by nfs4_stateowner.so_time
+         * for last close replay.
+         *
+         * All of the above fields are protected by the client_mutex.
+         */
+        struct list_head client_lru;
+        struct list_head close_lru;
+
+        struct delayed_work laundromat_work;
+
+        /* client_lock protects the client lru list and session hash table */
+        spinlock_t client_lock;
+
+        struct file *rec_file;
+        bool in_grace;
+        struct nfsd4_client_tracking_ops *client_tracking_ops;
+
+        time_t nfsd4_lease;
+        time_t nfsd4_grace;
+
+        bool nfsd_net_up;
+
+        /*
+         * Time of server startup
+         */
+        struct timeval nfssvc_boot;
+
+        struct svc_serv *nfsd_serv;
 };
 
+/* Simple check to find out if a given net was properly initialized */
+#define nfsd_netns_ready(nn) ((nn)->sessionid_hashtbl)
+
 extern int nfsd_net_id;
 #endif /* __NFSD_NETNS_H__ */