diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 12:59:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 12:59:11 -0800 |
| commit | 45e62974fb110da926e2a6c5b357c15639bdc233 (patch) | |
| tree | 0c2094de939e69fa3e44854c71aa45d7ec137895 /include | |
| parent | 756fe285070feb254a770cefc5640fe005ea9c27 (diff) | |
| parent | 8ff6af881deccca4f88e03f2fdadb1aac42e9489 (diff) | |
| download | linux-45e62974fb110da926e2a6c5b357c15639bdc233.tar.gz linux-45e62974fb110da926e2a6c5b357c15639bdc233.tar.bz2 linux-45e62974fb110da926e2a6c5b357c15639bdc233.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
ocfs2: Use FIEMAP_EXTENT_SHARED
fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
ocfs2: replace u8 by __u8 in ocfs2_fs.h
ocfs2: explicit declare uninitialized var in user_cluster_connect()
ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
ocfs2: return -EAGAIN instead of EAGAIN in dlm
ocfs2/cluster: Make fence method configurable - v2
ocfs2: Set MS_POSIXACL on remount
ocfs2: Make acl use the default
ocfs2: Always include ACL support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fiemap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h index 934e22d65801..d830747f5c0b 100644 --- a/include/linux/fiemap.h +++ b/include/linux/fiemap.h @@ -62,5 +62,7 @@ struct fiemap { #define FIEMAP_EXTENT_MERGED 0x00001000 /* File does not natively * support extents. Result * merged for efficiency. */ +#define FIEMAP_EXTENT_SHARED 0x00002000 /* Space shared with other + * files. */ #endif /* _LINUX_FIEMAP_H */ |