diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 09:35:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 09:35:51 +1100 |
| commit | 2bceee7a7dc1a71e42d30adaa97b587287fae45d (patch) | |
| tree | e966852f7a2822dddc668f27b9e48d850bfc854a /include | |
| parent | 0d8942e8029b33b1673e99b93e0107bef8ab2d02 (diff) | |
| parent | 2503140141dd614698249c437414fb6f3c1b51bc (diff) | |
Merge remote branch 'ocfs2/linux-next'
Conflicts:
fs/ocfs2/file.c
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 */ |