Commit 50e02fd84543d82e663000e780e0ec0cfde52283
1 parent
036acea2ce
Exists in
master
and in
13 other branches
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>
Showing 1 changed file with 0 additions and 9 deletions Side-by-side Diff
include/trace/events/ext4.h
| ... | ... | @@ -16,15 +16,6 @@ |
| 16 | 16 | struct ext4_map_blocks; |
| 17 | 17 | struct extent_status; |
| 18 | 18 | |
| 19 | -/* shim until we merge in the xfs_collapse_range branch */ | |
| 20 | -#ifndef FALLOC_FL_COLLAPSE_RANGE | |
| 21 | -#define FALLOC_FL_COLLAPSE_RANGE 0x08 | |
| 22 | -#endif | |
| 23 | - | |
| 24 | -#ifndef FALLOC_FL_ZERO_RANGE | |
| 25 | -#define FALLOC_FL_ZERO_RANGE 0x10 | |
| 26 | -#endif | |
| 27 | - | |
| 28 | 19 | #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode)) |
| 29 | 20 | |
| 30 | 21 | #define show_mballoc_flags(flags) __print_flags(flags, "|", \ |