2 files changed, 26 insertions, 2 deletions

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index f1edb1d98523..692edf4c2e7c 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -99,8 +99,12 @@ struct nfs4_callback {
         struct rpc_clnt *       cb_client;
 };
 
+/* Maximum number of slots per session. 128 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION      128
 /* Maximum number of pages per slot cache entry */
 #define NFSD_PAGES_PER_SLOT     1
+/* Maximum number of operations per session compound */
+#define NFSD_MAX_OPS_PER_COMPOUND       16
 
 struct nfsd4_cache_entry {
         __be32          ce_status;
@@ -129,7 +133,7 @@ struct nfsd4_session {
         u32                     se_fmaxresp_cached;
         u32                     se_fmaxops;
         u32                     se_fnumslots;
-        struct nfsd4_slot       *se_slots;      /* forward channel slots */
+        struct nfsd4_slot       se_slots[];     /* forward channel slots */
 };
 
 static inline void
@@ -188,6 +192,7 @@ struct nfs4_client {
         struct list_head        cl_sessions;
         u32                     cl_seqid;       /* seqid for create_session */
         u32                     cl_exchange_flags;
+        struct nfs4_sessionid   cl_sessionid;
 };
 
 /* struct nfs4_client_reset
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 69cb467cb720..9468829adb70 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -359,8 +359,27 @@ struct nfsd4_exchange_id {
         int             spa_how;
 };
 
+struct nfsd4_channel_attrs {
+        u32             headerpadsz;
+        u32             maxreq_sz;
+        u32             maxresp_sz;
+        u32             maxresp_cached;
+        u32             maxops;
+        u32             maxreqs;
+        u32             nr_rdma_attrs;
+        u32             rdma_attrs;
+};
+
 struct nfsd4_create_session {
-        int     foo;    /* stub */
+        clientid_t              clientid;
+        struct nfs4_sessionid   sessionid;
+        u32                     seqid;
+        u32                     flags;
+        struct nfsd4_channel_attrs fore_channel;
+        struct nfsd4_channel_attrs back_channel;
+        u32                     callback_prog;
+        u32                     uid;
+        u32                     gid;
 };
 
 struct nfsd4_sequence {