diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /include/linux/nfs_fs_sb.h | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
Diffstat (limited to 'include/linux/nfs_fs_sb.h')
| -rw-r--r-- | include/linux/nfs_fs_sb.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 19fe15d12042..320569eabe3b 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
| @@ -167,6 +167,15 @@ struct nfs_server { | |||
| 167 | #define NFS_CAP_SYMLINKS (1U << 2) | 167 | #define NFS_CAP_SYMLINKS (1U << 2) |
| 168 | #define NFS_CAP_ACLS (1U << 3) | 168 | #define NFS_CAP_ACLS (1U << 3) |
| 169 | #define NFS_CAP_ATOMIC_OPEN (1U << 4) | 169 | #define NFS_CAP_ATOMIC_OPEN (1U << 4) |
| 170 | #define NFS_CAP_CHANGE_ATTR (1U << 5) | ||
| 171 | #define NFS_CAP_FILEID (1U << 6) | ||
| 172 | #define NFS_CAP_MODE (1U << 7) | ||
| 173 | #define NFS_CAP_NLINK (1U << 8) | ||
| 174 | #define NFS_CAP_OWNER (1U << 9) | ||
| 175 | #define NFS_CAP_OWNER_GROUP (1U << 10) | ||
| 176 | #define NFS_CAP_ATIME (1U << 11) | ||
| 177 | #define NFS_CAP_CTIME (1U << 12) | ||
| 178 | #define NFS_CAP_MTIME (1U << 13) | ||
| 170 | 179 | ||
| 171 | 180 | ||
| 172 | /* maximum number of slots to use */ | 181 | /* maximum number of slots to use */ |