Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[safe/jmp/linux-2.6] / include / linux / nfs_mount.h

diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
index 0071428..a3ade89 100644 (file)
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
@@ -37,7 +37,7 @@ struct nfs_mount_data {
        int             acdirmin;               /* 1 */
        int             acdirmax;               /* 1 */
        struct sockaddr_in addr;                /* 1 */
-       char            hostname[256];          /* 1 */
+       char            hostname[NFS_MAXNAMLEN + 1];            /* 1 */
        int             namlen;                 /* 2 */
        unsigned int    bsize;                  /* 3 */
        struct nfs3_fh  root;                   /* 4 */
@@ -58,8 +58,11 @@ struct nfs_mount_data {
 #define NFS_MOUNT_KERBEROS     0x0100  /* 3 */
 #define NFS_MOUNT_NONLM                0x0200  /* 3 */
 #define NFS_MOUNT_BROKEN_SUID  0x0400  /* 4 */
+#define NFS_MOUNT_NOACL                0x0800  /* 4 */
 #define NFS_MOUNT_STRICTLOCK   0x1000  /* reserved for NFSv4 */
 #define NFS_MOUNT_SECFLAVOUR   0x2000  /* 5 */
+#define NFS_MOUNT_NORDIRPLUS   0x4000  /* 5 */
+#define NFS_MOUNT_UNSHARED     0x8000  /* 5 */
 #define NFS_MOUNT_FLAGMASK     0xFFFF
 
 #endif