diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-04-15 07:37:35 +0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-04-15 07:37:35 +0400 |
| commit | 50e02fd84543d82e663000e780e0ec0cfde52283 (patch) | |
| tree | 8ce93ca440bfe793d7723662438fd01a1b3a4ee9 /include/trace/events/ext4.h | |
| parent | 036acea2ceabd19cb5734ae7a9d64c0a5ef90484 (diff) | |
| download | linux-50e02fd84543d82e663000e780e0ec0cfde52283.tar.xz | |
ext4: remove temporary shim used to merge COLLAPSE_RANGE and ZERO_RANGE
In retrospect, this was a bad way to handle things, since it limited
testing of these patches. We should just get the VFS level changes
merged in first.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'include/trace/events/ext4.h')
| -rw-r--r-- | include/trace/events/ext4.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 010ea89eeb0e..6a1a0245474f 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -16,15 +16,6 @@ struct mpage_da_data; struct ext4_map_blocks; struct extent_status; -/* shim until we merge in the xfs_collapse_range branch */ -#ifndef FALLOC_FL_COLLAPSE_RANGE -#define FALLOC_FL_COLLAPSE_RANGE 0x08 -#endif - -#ifndef FALLOC_FL_ZERO_RANGE -#define FALLOC_FL_ZERO_RANGE 0x10 -#endif - #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode)) #define show_mballoc_flags(flags) __print_flags(flags, "|", \ |