Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31

2009-06-17 17:59:58 -07:00
parent 3fe0344faf 68f3f90133
commit 301933a0ac
38 changed files with 4589 additions and 374 deletions
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@ -41,7 +41,6 @@
 #include <linux/kref.h>
 #include <linux/sunrpc/clnt.h>

-#define NFS4_OPAQUE_LIMIT 1024
 typedef struct {
 	u32             cl_boot;
 	u32             cl_id;