Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / linux / nfs4.h

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 4925b22219d25cfa654aa9d515950acc36d977f4..134716e5e3509f9c56e11334137a9aefb41c4a21 100644 (file)
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -65,6 +65,9 @@
 
 #define NFS4_CDFC4_FORE        0x1
 #define NFS4_CDFC4_BACK 0x2
+#define NFS4_CDFC4_BOTH 0x3
+#define NFS4_CDFC4_FORE_OR_BOTH 0x3
+#define NFS4_CDFC4_BACK_OR_BOTH 0x7
 
 #define NFS4_SET_TO_SERVER_TIME        0
 #define NFS4_SET_TO_CLIENT_TIME        1
@@ -111,9 +114,13 @@
 
 #define EXCHGID4_FLAG_SUPP_MOVED_REFER         0x00000001
 #define EXCHGID4_FLAG_SUPP_MOVED_MIGR          0x00000002
+#define EXCHGID4_FLAG_BIND_PRINC_STATEID       0x00000100
+
 #define EXCHGID4_FLAG_USE_NON_PNFS             0x00010000
 #define EXCHGID4_FLAG_USE_PNFS_MDS             0x00020000
 #define EXCHGID4_FLAG_USE_PNFS_DS              0x00040000
+#define EXCHGID4_FLAG_MASK_PNFS                        0x00070000
+
 #define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A      0x40000000
 #define EXCHGID4_FLAG_CONFIRMED_R              0x80000000
 /*
@@ -121,8 +128,8 @@
  * they're set in the argument or response, have separate
  * invalid flag masks for arg (_A) and resp (_R).
  */
-#define EXCHGID4_FLAG_MASK_A                   0x40070003
-#define EXCHGID4_FLAG_MASK_R                   0x80070003
+#define EXCHGID4_FLAG_MASK_A                   0x40070103
+#define EXCHGID4_FLAG_MASK_R                   0x80070103
 
 #define SEQ4_STATUS_CB_PATH_DOWN               0x00000001
 #define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING   0x00000002
@@ -136,6 +143,9 @@
 #define SEQ4_STATUS_CB_PATH_DOWN_SESSION       0x00000200
 #define SEQ4_STATUS_BACKCHANNEL_FAULT          0x00000400
 
+#define NFS4_SECINFO_STYLE4_CURRENT_FH 0
+#define NFS4_SECINFO_STYLE4_PARENT     1
+
 #define NFS4_MAX_UINT64        (~(u64)0)
 
 /* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.