Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / include / linux / nfs4.h

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index e7e78537aea2cbeba658bc8591350961b089fa58..d6f9b4e6006d0f3013a1386321685b01bd5e45c6 100644 (file)
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -139,10 +139,10 @@ enum nfs_opnum4 {
 Needs to be updated if more operations are defined in future.*/
 
 #define FIRST_NFS4_OP  OP_ACCESS
-#define LAST_NFS4_OP   OP_WRITE_SAME
 #define LAST_NFS40_OP  OP_RELEASE_LOCKOWNER
 #define LAST_NFS41_OP  OP_RECLAIM_COMPLETE
-#define LAST_NFS42_OP  OP_WRITE_SAME
+#define LAST_NFS42_OP  OP_CLONE
+#define LAST_NFS4_OP   LAST_NFS42_OP
 
 enum nfsstat4 {
        NFS4_OK = 0,
@@ -592,4 +592,18 @@ enum data_content4 {
        NFS4_CONTENT_HOLE               = 1,
 };
 
+enum pnfs_update_layout_reason {
+       PNFS_UPDATE_LAYOUT_UNKNOWN = 0,
+       PNFS_UPDATE_LAYOUT_NO_PNFS,
+       PNFS_UPDATE_LAYOUT_RD_ZEROLEN,
+       PNFS_UPDATE_LAYOUT_MDSTHRESH,
+       PNFS_UPDATE_LAYOUT_NOMEM,
+       PNFS_UPDATE_LAYOUT_BULK_RECALL,
+       PNFS_UPDATE_LAYOUT_IO_TEST_FAIL,
+       PNFS_UPDATE_LAYOUT_FOUND_CACHED,
+       PNFS_UPDATE_LAYOUT_RETURN,
+       PNFS_UPDATE_LAYOUT_BLOCKED,
+       PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET,
+};
+
 #endif