add patch move-error-report-out-of-atomic-context
[ext4-patch-queue.git] / renumber-ext4_ex-flags
blobc9928280e63119ccca006c4273f98d090082f9e6
1 ext4: renumber EXT4_EX_* flags to avoid flag aliasing problems
3 Suggested-by: Andreas Dilger <adilger@dilger.ca>
4 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
5 ---
6  fs/ext4/ext4.h | 5 ++---
7  1 file changed, 2 insertions(+), 3 deletions(-)
9 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
10 index 4855800..f70c3fc 100644
11 --- a/fs/ext4/ext4.h
12 +++ b/fs/ext4/ext4.h
13 @@ -569,7 +569,6 @@ enum {
14  #define EXT4_GET_BLOCKS_NO_PUT_HOLE            0x0200
15         /* Convert written extents to unwritten */
16  #define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN      0x0400
17 -/* DO NOT ASSIGN ADDITIONAL FLAG VALUES WITHOUT ADJUSTING THE FLAGS BELOW */
19  /*
20   * The bit position of these flags must not overlap with any of the
21 @@ -580,8 +579,8 @@ enum {
22   * caching the extents when reading from the extent tree while a
23   * truncate or punch hole operation is in progress.
24   */
25 -#define EXT4_EX_NOCACHE                                0x0800
26 -#define EXT4_EX_FORCE_CACHE                    0x1000
27 +#define EXT4_EX_NOCACHE                                0x40000000
28 +#define EXT4_EX_FORCE_CACHE                    0x20000000
30  /*
31   * Flags used by ext4_free_blocks