Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ext4: fix accidental flag aliasing in ext4_map_blocks flags

Browse source 
Commit b8a8684502 introduced an accidental flag aliasing between
EXT4_EX_NOCACHE and EXT4_GET_BLOCKS_CONVERT_UNWRITTEN.

Fortunately, this didn't introduce any untorward side effects --- we
got lucky.  Nevertheless, fix this and leave a warning to hopefully
avoid this from happening in the future.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2014-09-01 14:33:09 -04:00
parent 713e8dde3e
commit bd30d702fc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/ext4/ext4.h
View file

@ -569,6 +569,7 @@ enum {
#define EXT4_GET_BLOCKS_NO_PUT_HOLE 0x0200 #define EXT4_GET_BLOCKS_NO_PUT_HOLE 0x0200
/* Convert written extents to unwritten */ /* Convert written extents to unwritten */
#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN 0x0400 #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 * The bit position of these flags must not overlap with any of the
@ -579,8 +580,8 @@ enum {
* caching the extents when reading from the extent tree while a * caching the extents when reading from the extent tree while a
* truncate or punch hole operation is in progress. * truncate or punch hole operation is in progress.
*/ */
#define EXT4_EX_NOCACHE 0x0400 #define EXT4_EX_NOCACHE 0x0800
#define EXT4_EX_FORCE_CACHE 0x0800 #define EXT4_EX_FORCE_CACHE 0x1000
/* /*
* Flags used by ext4_free_blocks * Flags used by ext4_free_blocks