[XFS] Fix merge failures

[pandora-kernel.git] / include / linux / nfs_mount.h

diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
index a3ade89..6549a06 100644 (file)
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
@@ -48,7 +48,7 @@ struct nfs_mount_data {
 /* bits in the flags field */
 
 #define NFS_MOUNT_SOFT         0x0001  /* 1 */
-#define NFS_MOUNT_INTR         0x0002  /* 1 */
+#define NFS_MOUNT_INTR         0x0002  /* 1 */ /* now unused, but ABI */
 #define NFS_MOUNT_SECURE       0x0004  /* 1 */
 #define NFS_MOUNT_POSIX                0x0008  /* 1 */
 #define NFS_MOUNT_NOCTO                0x0010  /* 1 */
@@ -65,4 +65,8 @@ struct nfs_mount_data {
 #define NFS_MOUNT_UNSHARED     0x8000  /* 5 */
 #define NFS_MOUNT_FLAGMASK     0xFFFF
 
+/* The following are for internal use only */
+#define NFS_MOUNT_LOOKUP_CACHE_NONEG   0x10000
+#define NFS_MOUNT_LOOKUP_CACHE_NONE    0x20000
+
 #endif