1 ext4: remove temporary shim used to merge COLLAPSE_RANGE and ZERO_RANGE
3 In retrospect, this was a bad way to handle things, since it limited
4 testing of these patches. We should just get the VFS level changes
7 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
9 include/trace/events/ext4.h | 9 ---------
10 1 file changed, 9 deletions(-)
12 diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
13 index 010ea89..6a1a024 100644
14 --- a/include/trace/events/ext4.h
15 +++ b/include/trace/events/ext4.h
16 @@ -16,15 +16,6 @@ struct mpage_da_data;
17 struct ext4_map_blocks;
20 -/* shim until we merge in the xfs_collapse_range branch */
21 -#ifndef FALLOC_FL_COLLAPSE_RANGE
22 -#define FALLOC_FL_COLLAPSE_RANGE 0x08
25 -#ifndef FALLOC_FL_ZERO_RANGE
26 -#define FALLOC_FL_ZERO_RANGE 0x10
29 #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
31 #define show_mballoc_flags(flags) __print_flags(flags, "|", \