aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexandros Batsakis <Alexandros.Batsakis@netapp.com>2009-06-15 21:19:13 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-06-16 13:13:45 -0400
commit6c18ba9f5e506b8115b89b1aa7bdc25178f40b0a (patch)
tree12f046162b585649490be390695302bfdce11630 /include
parentb9081d90f5b989cd927052084b16b4f950c8c8d7 (diff)
nfsd41: move channel attributes from nfsd4_session to a nfsd4_channel_attr struct
the change is valid for both the forechannel and the backchannel (currently dummy) Signed-off-by: Alexandros Batsakis <Alexandros.Batsakis@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfsd/state.h18
-rw-r--r--include/linux/nfsd/xdr4.h11
2 files changed, 13 insertions, 16 deletions
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index c0c49215ddc5..105cc100de05 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -115,6 +115,17 @@ struct nfsd4_slot {
115 struct nfsd4_cache_entry sl_cache_entry; 115 struct nfsd4_cache_entry sl_cache_entry;
116}; 116};
117 117
118struct nfsd4_channel_attrs {
119 u32 headerpadsz;
120 u32 maxreq_sz;
121 u32 maxresp_sz;
122 u32 maxresp_cached;
123 u32 maxops;
124 u32 maxreqs;
125 u32 nr_rdma_attrs;
126 u32 rdma_attrs;
127};
128
118struct nfsd4_session { 129struct nfsd4_session {
119 struct kref se_ref; 130 struct kref se_ref;
120 struct list_head se_hash; /* hash by sessionid */ 131 struct list_head se_hash; /* hash by sessionid */
@@ -122,11 +133,8 @@ struct nfsd4_session {
122 u32 se_flags; 133 u32 se_flags;
123 struct nfs4_client *se_client; /* for expire_client */ 134 struct nfs4_client *se_client; /* for expire_client */
124 struct nfs4_sessionid se_sessionid; 135 struct nfs4_sessionid se_sessionid;
125 u32 se_fmaxreq_sz; 136 struct nfsd4_channel_attrs se_fchannel;
126 u32 se_fmaxresp_sz; 137 struct nfsd4_channel_attrs se_bchannel;
127 u32 se_fmaxresp_cached;
128 u32 se_fmaxops;
129 u32 se_fnumslots;
130 struct nfsd4_slot se_slots[]; /* forward channel slots */ 138 struct nfsd4_slot se_slots[]; /* forward channel slots */
131}; 139};
132 140
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index d0f050f01eca..2bacf7535069 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -366,17 +366,6 @@ struct nfsd4_exchange_id {
366 int spa_how; 366 int spa_how;
367}; 367};
368 368
369struct nfsd4_channel_attrs {
370 u32 headerpadsz;
371 u32 maxreq_sz;
372 u32 maxresp_sz;
373 u32 maxresp_cached;
374 u32 maxops;
375 u32 maxreqs;
376 u32 nr_rdma_attrs;
377 u32 rdma_attrs;
378};
379
380struct nfsd4_create_session { 369struct nfsd4_create_session {
381 clientid_t clientid; 370 clientid_t clientid;
382 struct nfs4_sessionid sessionid; 371 struct nfs4_sessionid sessionid;