1 files changed, 60 insertions, 2 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 79b15fb2f30..4925b22219d 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -17,7 +17,9 @@
 
 #define NFS4_BITMAP_SIZE        2
 #define NFS4_VERIFIER_SIZE      8
-#define NFS4_STATEID_SIZE       16
+#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
@@ -170,7 +172,16 @@ struct nfs4_acl {
 };
 
 typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
-typedef struct { char data[NFS4_STATEID_SIZE]; } nfs4_stateid;
+
+struct nfs41_stateid {
+        __be32 seqid;
+        char other[NFS4_STATEID_OTHER_SIZE];
+} __attribute__ ((packed));
+
+typedef union {
+        char data[NFS4_STATEID_SIZE];
+        struct nfs41_stateid stateid;
+} nfs4_stateid;
 
 enum nfs_opnum4 {
         OP_ACCESS = 3,
@@ -474,6 +485,8 @@ enum lock_type4 {
 #define FATTR4_WORD1_TIME_MODIFY        (1UL << 21)
 #define FATTR4_WORD1_TIME_MODIFY_SET    (1UL << 22)
 #define FATTR4_WORD1_MOUNTED_ON_FILEID  (1UL << 23)
+#define FATTR4_WORD1_FS_LAYOUT_TYPES    (1UL << 30)
+#define FATTR4_WORD2_LAYOUT_BLKSIZE     (1UL << 1)
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
@@ -535,6 +548,8 @@ enum {
         NFSPROC4_CLNT_SEQUENCE,
         NFSPROC4_CLNT_GET_LEASE_TIME,
         NFSPROC4_CLNT_RECLAIM_COMPLETE,
+        NFSPROC4_CLNT_LAYOUTGET,
+        NFSPROC4_CLNT_GETDEVICEINFO,
 };
 
 /* nfs41 types */
@@ -553,6 +568,49 @@ enum state_protect_how4 {
         SP4_SSV         = 2
 };
 
+enum pnfs_layouttype {
+        LAYOUT_NFSV4_1_FILES  = 1,
+        LAYOUT_OSD2_OBJECTS = 2,
+        LAYOUT_BLOCK_VOLUME = 3,
+};
+
+/* used for both layout return and recall */
+enum pnfs_layoutreturn_type {
+        RETURN_FILE = 1,
+        RETURN_FSID = 2,
+        RETURN_ALL  = 3
+};
+
+enum pnfs_iomode {
+        IOMODE_READ = 1,
+        IOMODE_RW = 2,
+        IOMODE_ANY = 3,
+};
+
+enum pnfs_notify_deviceid_type4 {
+        NOTIFY_DEVICEID4_CHANGE = 1 << 1,
+        NOTIFY_DEVICEID4_DELETE = 1 << 2,
+};
+
+#define NFL4_UFLG_MASK                  0x0000003F
+#define NFL4_UFLG_DENSE                 0x00000001
+#define NFL4_UFLG_COMMIT_THRU_MDS       0x00000002
+#define NFL4_UFLG_STRIPE_UNIT_SIZE_MASK 0xFFFFFFC0
+
+/* Encoded in the loh_body field of type layouthint4 */
+enum filelayout_hint_care4 {
+        NFLH4_CARE_DENSE                = NFL4_UFLG_DENSE,
+        NFLH4_CARE_COMMIT_THRU_MDS      = NFL4_UFLG_COMMIT_THRU_MDS,
+        NFLH4_CARE_STRIPE_UNIT_SIZE     = 0x00000040,
+        NFLH4_CARE_STRIPE_COUNT         = 0x00000080
+};
+
+#define NFS4_DEVICEID4_SIZE 16
+
+struct nfs4_deviceid {
+        char data[NFS4_DEVICEID4_SIZE];
+};
+
 #endif
 #endif