summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2014-09-04 18:09:29 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-09-04 18:09:29 -0400
commitd26e2c4d72c2f2a38246f618480864fe3224929c (patch)
tree93a7ac810fb0ceac3bb8f957b6c70bba4017d1a9 /fs/ext4
parent0e5ecf0a762627b949141df1d83094a9b0eb54a8 (diff)
downloadlinux-stable-d26e2c4d72c2f2a38246f618480864fe3224929c.tar.gz
linux-stable-d26e2c4d72c2f2a38246f618480864fe3224929c.tar.bz2
linux-stable-d26e2c4d72c2f2a38246f618480864fe3224929c.zip
ext4: renumber EXT4_EX_* flags to avoid flag aliasing problems
Suggested-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/ext4.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 4855800fcc5d..f70c3fc94296 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -569,7 +569,6 @@ enum {
#define EXT4_GET_BLOCKS_NO_PUT_HOLE 0x0200
/* Convert written extents to unwritten */
#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN 0x0400
-/* DO NOT ASSIGN ADDITIONAL FLAG VALUES WITHOUT ADJUSTING THE FLAGS BELOW */
/*
* The bit position of these flags must not overlap with any of the
@@ -580,8 +579,8 @@ enum {
* caching the extents when reading from the extent tree while a
* truncate or punch hole operation is in progress.
*/
-#define EXT4_EX_NOCACHE 0x0800
-#define EXT4_EX_FORCE_CACHE 0x1000
+#define EXT4_EX_NOCACHE 0x40000000
+#define EXT4_EX_FORCE_CACHE 0x20000000
/*
* Flags used by ext4_free_blocks