Patched in Tegra support.

1 files changed, 168 insertions, 46 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index e111fa419a4..76f99e8714f 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -9,11 +9,164 @@
  *  Kendrick Smith <kmsmith@umich.edu>
  *  Andy Adamson   <andros@umich.edu>
  */
+
 #ifndef _LINUX_NFS4_H
 #define _LINUX_NFS4_H
 
+#include <linux/types.h>
+
+#define NFS4_BITMAP_SIZE        2
+#define NFS4_VERIFIER_SIZE      8
+#define NFS4_STATEID_SEQID_SIZE 4
+#define NFS4_STATEID_OTHER_SIZE 12
+#define NFS4_STATEID_SIZE       (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE)
+#define NFS4_FHSIZE             128
+#define NFS4_MAXPATHLEN         PATH_MAX
+#define NFS4_MAXNAMLEN          NAME_MAX
+#define NFS4_OPAQUE_LIMIT       1024
+#define NFS4_MAX_SESSIONID_LEN  16
+
+#define NFS4_ACCESS_READ        0x0001
+#define NFS4_ACCESS_LOOKUP      0x0002
+#define NFS4_ACCESS_MODIFY      0x0004
+#define NFS4_ACCESS_EXTEND      0x0008
+#define NFS4_ACCESS_DELETE      0x0010
+#define NFS4_ACCESS_EXECUTE     0x0020
+
+#define NFS4_FH_PERSISTENT              0x0000
+#define NFS4_FH_NOEXPIRE_WITH_OPEN      0x0001
+#define NFS4_FH_VOLATILE_ANY            0x0002
+#define NFS4_FH_VOL_MIGRATION           0x0004
+#define NFS4_FH_VOL_RENAME              0x0008
+
+#define NFS4_OPEN_RESULT_CONFIRM 0x0002
+#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
+
+#define NFS4_SHARE_ACCESS_MASK  0x000F
+#define NFS4_SHARE_ACCESS_READ  0x0001
+#define NFS4_SHARE_ACCESS_WRITE 0x0002
+#define NFS4_SHARE_ACCESS_BOTH  0x0003
+#define NFS4_SHARE_DENY_READ    0x0001
+#define NFS4_SHARE_DENY_WRITE   0x0002
+#define NFS4_SHARE_DENY_BOTH    0x0003
+
+/* nfs41 */
+#define NFS4_SHARE_WANT_MASK            0xFF00
+#define NFS4_SHARE_WANT_NO_PREFERENCE   0x0000
+#define NFS4_SHARE_WANT_READ_DELEG      0x0100
+#define NFS4_SHARE_WANT_WRITE_DELEG     0x0200
+#define NFS4_SHARE_WANT_ANY_DELEG       0x0300
+#define NFS4_SHARE_WANT_NO_DELEG        0x0400
+#define NFS4_SHARE_WANT_CANCEL          0x0500
+
+#define NFS4_SHARE_WHEN_MASK            0xF0000
+#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL        0x10000
+#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED          0x20000
+
+#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
+
+#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
+#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
+#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
+#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
+
+#define ACL4_SUPPORT_ALLOW_ACL 0x01
+#define ACL4_SUPPORT_DENY_ACL  0x02
+#define ACL4_SUPPORT_AUDIT_ACL 0x04
+#define ACL4_SUPPORT_ALARM_ACL 0x08
+
+#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
+#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
+#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
+#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
+#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
+#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
+#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
+
+#define NFS4_ACE_READ_DATA                    0x00000001
+#define NFS4_ACE_LIST_DIRECTORY               0x00000001
+#define NFS4_ACE_WRITE_DATA                   0x00000002
+#define NFS4_ACE_ADD_FILE                     0x00000002
+#define NFS4_ACE_APPEND_DATA                  0x00000004
+#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
+#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
+#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
+#define NFS4_ACE_EXECUTE                      0x00000020
+#define NFS4_ACE_DELETE_CHILD                 0x00000040
+#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
+#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
+#define NFS4_ACE_DELETE                       0x00010000
+#define NFS4_ACE_READ_ACL                     0x00020000
+#define NFS4_ACE_WRITE_ACL                    0x00040000
+#define NFS4_ACE_WRITE_OWNER                  0x00080000
+#define NFS4_ACE_SYNCHRONIZE                  0x00100000
+#define NFS4_ACE_GENERIC_READ                 0x00120081
+#define NFS4_ACE_GENERIC_WRITE                0x00160106
+#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
+#define NFS4_ACE_MASK_ALL                     0x001F01FF
+
+#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
+/*
+ * Since the validity of these bits depends on whether
+ * they're set in the argument or response, have separate
+ * invalid flag masks for arg (_A) and resp (_R).
+ */
+#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
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED     0x00000004
+#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED   0x00000008
+#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED  0x00000010
+#define SEQ4_STATUS_ADMIN_STATE_REVOKED         0x00000020
+#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED    0x00000040
+#define SEQ4_STATUS_LEASE_MOVED                 0x00000080
+#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED      0x00000100
+#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.
+ * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
+ */
+#define NFS4_MAX_OPS   8
+
+/* Our NFS4 client back channel server only wants the cb_sequene and the
+ * actual operation per compound
+ */
+#define NFS4_MAX_BACK_CHANNEL_OPS 2
+
+enum nfs4_acl_whotype {
+        NFS4_ACL_WHO_NAMED = 0,
+        NFS4_ACL_WHO_OWNER,
+        NFS4_ACL_WHO_GROUP,
+        NFS4_ACL_WHO_EVERYONE,
+};
+
+#ifdef __KERNEL__
 #include <linux/list.h>
-#include <uapi/linux/nfs4.h>
 
 struct nfs4_ace {
         uint32_t        type;
@@ -30,12 +183,15 @@ struct nfs4_acl {
 
 typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
 
-struct nfs_stateid4 {
+struct nfs41_stateid {
         __be32 seqid;
         char other[NFS4_STATEID_OTHER_SIZE];
 } __attribute__ ((packed));
 
-typedef struct nfs_stateid4 nfs4_stateid;
+typedef union {
+        char data[NFS4_STATEID_SIZE];
+        struct nfs41_stateid stateid;
+} nfs4_stateid;
 
 enum nfs_opnum4 {
         OP_ACCESS = 3,
@@ -217,22 +373,6 @@ enum nfsstat4 {
         NFS4ERR_DELEG_REVOKED   = 10087,        /* deleg./layout revoked */
 };
 
-static inline bool seqid_mutating_err(u32 err)
-{
-        /* rfc 3530 section 8.1.5: */
-        switch (err) {
-        case NFS4ERR_STALE_CLIENTID:
-        case NFS4ERR_STALE_STATEID:
-        case NFS4ERR_BAD_STATEID:
-        case NFS4ERR_BAD_SEQID:
-        case NFS4ERR_BADXDR:
-        case NFS4ERR_RESOURCE:
-        case NFS4ERR_NOFILEHANDLE:
-                return false;
-        };
-        return true;
-}
-
 /*
  * Note: NF4BAD is not actually part of the protocol; it is just used
  * internally by nfsd.
@@ -254,10 +394,7 @@ enum open_claim_type4 {
         NFS4_OPEN_CLAIM_NULL = 0,
         NFS4_OPEN_CLAIM_PREVIOUS = 1,
         NFS4_OPEN_CLAIM_DELEGATE_CUR = 2,
-        NFS4_OPEN_CLAIM_DELEGATE_PREV = 3,
-        NFS4_OPEN_CLAIM_FH = 4, /* 4.1 */
-        NFS4_OPEN_CLAIM_DELEG_CUR_FH = 5, /* 4.1 */
-        NFS4_OPEN_CLAIM_DELEG_PREV_FH = 6, /* 4.1 */
+        NFS4_OPEN_CLAIM_DELEGATE_PREV = 3
 };
 
 enum opentype4 {
@@ -285,20 +422,7 @@ enum limit_by4 {
 enum open_delegation_type4 {
         NFS4_OPEN_DELEGATE_NONE = 0,
         NFS4_OPEN_DELEGATE_READ = 1,
-        NFS4_OPEN_DELEGATE_WRITE = 2,
-        NFS4_OPEN_DELEGATE_NONE_EXT = 3, /* 4.1 */
-};
-
-enum why_no_delegation4 { /* new to v4.1 */
-        WND4_NOT_WANTED = 0,
-        WND4_CONTENTION = 1,
-        WND4_RESOURCE = 2,
-        WND4_NOT_SUPP_FTYPE = 3,
-        WND4_WRITE_DELEG_NOT_SUPP_FTYPE = 4,
-        WND4_NOT_SUPP_UPGRADE = 5,
-        WND4_NOT_SUPP_DOWNGRADE = 6,
-        WND4_CANCELLED = 7,
-        WND4_IS_DIR = 8,
+        NFS4_OPEN_DELEGATE_WRITE = 2
 };
 
 enum lock_type4 {
@@ -373,13 +497,6 @@ enum lock_type4 {
 #define FATTR4_WORD1_MOUNTED_ON_FILEID  (1UL << 23)
 #define FATTR4_WORD1_FS_LAYOUT_TYPES    (1UL << 30)
 #define FATTR4_WORD2_LAYOUT_BLKSIZE     (1UL << 1)
-#define FATTR4_WORD2_MDSTHRESHOLD       (1UL << 4)
-
-/* MDS threshold bitmap bits */
-#define THRESHOLD_RD                    (1UL << 0)
-#define THRESHOLD_WR                    (1UL << 1)
-#define THRESHOLD_RD_IO                 (1UL << 2)
-#define THRESHOLD_WR_IO                 (1UL << 3)
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
@@ -450,8 +567,6 @@ enum {
         NFSPROC4_CLNT_TEST_STATEID,
         NFSPROC4_CLNT_FREE_STATEID,
         NFSPROC4_CLNT_GETDEVICELIST,
-        NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
-        NFSPROC4_CLNT_DESTROY_CLIENTID,
 };
 
 /* nfs41 types */
@@ -516,3 +631,10 @@ struct nfs4_deviceid {
 };
 
 #endif
+#endif
+
+/*
+ * Local variables:
+ *  c-basic-offset: 8
+ * End:
+ */