Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[cascardo/linux.git] / fs / nfsd / netns.h

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 2c4b2e2..1051beb 100644 (file)
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -35,6 +35,7 @@
 #define SESSION_HASH_SIZE      512
 
 struct cld_net;
+struct nfsd4_client_tracking_ops;
 
 struct nfsd_net {
        struct cld_net *cld_net;
@@ -87,10 +88,23 @@ struct nfsd_net {
 
        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__ */