diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
| commit | 08cc36cbd1ee7d86422713bb21551eed1326b894 (patch) | |
| tree | 52cc683387f903b34a7f6f798dcdbae385b58db8 /include/linux/nfs_mount.h | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| parent | 46f72f57d279688c4524df78edb5738db730eeef (diff) | |
Merge branch 'devel' into next
Diffstat (limited to 'include/linux/nfs_mount.h')
| -rw-r--r-- | include/linux/nfs_mount.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h index 6549a06ac16e..4499016e6d0d 100644 --- a/include/linux/nfs_mount.h +++ b/include/linux/nfs_mount.h | |||
| @@ -45,7 +45,7 @@ struct nfs_mount_data { | |||
| 45 | char context[NFS_MAX_CONTEXT_LEN + 1]; /* 6 */ | 45 | char context[NFS_MAX_CONTEXT_LEN + 1]; /* 6 */ |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | /* bits in the flags field */ | 48 | /* bits in the flags field visible to user space */ |
| 49 | 49 | ||
| 50 | #define NFS_MOUNT_SOFT 0x0001 /* 1 */ | 50 | #define NFS_MOUNT_SOFT 0x0001 /* 1 */ |
| 51 | #define NFS_MOUNT_INTR 0x0002 /* 1 */ /* now unused, but ABI */ | 51 | #define NFS_MOUNT_INTR 0x0002 /* 1 */ /* now unused, but ABI */ |
| @@ -68,5 +68,6 @@ struct nfs_mount_data { | |||
| 68 | /* The following are for internal use only */ | 68 | /* The following are for internal use only */ |
| 69 | #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 | 69 | #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 |
| 70 | #define NFS_MOUNT_LOOKUP_CACHE_NONE 0x20000 | 70 | #define NFS_MOUNT_LOOKUP_CACHE_NONE 0x20000 |
| 71 | #define NFS_MOUNT_NORESVPORT 0x40000 | ||
| 71 | 72 | ||
| 72 | #endif | 73 | #endif |