diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 11:03:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 11:03:19 +1000 |
| commit | 2726f5fb0d9f30619bb3e0dc8a9dd56b69524d2c (patch) | |
| tree | 27c53e7237e3510617c521afd424839acff9b374 /include | |
| parent | d08468df3ab82b5e2f129c9dc2d7db9bbf5565cd (diff) | |
| parent | 6ce2357f1e73e0da8ebeace6ec829f48a646bb8c (diff) | |
Merge remote-tracking branch 'nfsd/nfsd-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs4.h | 8 | ||||
| -rw-r--r-- | include/linux/sunrpc/svcsock.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 178fafe0ff93..8e66c5ccc1c4 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -570,9 +570,11 @@ struct nfs4_sessionid { }; /* Create Session Flags */ -#define SESSION4_PERSIST 0x001 -#define SESSION4_BACK_CHAN 0x002 -#define SESSION4_RDMA 0x004 +#define SESSION4_PERSIST 0x001 +#define SESSION4_BACK_CHAN 0x002 +#define SESSION4_RDMA 0x004 + +#define SESSION4_FLAG_MASK_A 0x007 enum state_protect_how4 { SP4_NONE = 0, diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h index 04dba23c59f2..85c50b40759d 100644 --- a/include/linux/sunrpc/svcsock.h +++ b/include/linux/sunrpc/svcsock.h @@ -28,6 +28,7 @@ struct svc_sock { /* private TCP part */ u32 sk_reclen; /* length of record */ u32 sk_tcplen; /* current read length */ + struct page * sk_pages[RPCSVC_MAXPAGES]; /* received data */ }; /* |