Whamcloud - gitweb
libext2fs: Change EXT2_FLAG_DIRECT_IO to avoid conflict with devel branch
authorTheodore Ts'o <tytso@mit.edu>
Sat, 25 Sep 2010 02:22:09 +0000 (22:22 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 25 Sep 2010 02:22:09 +0000 (22:22 -0400)
The development branch of e2fsprogs already has a code point assigned
in conflict with EXT2_FLAG_DIRECT_IO.  Fix this.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
lib/ext2fs/ext2fs.h

index 8dac89a..cf76562 100644 (file)
@@ -173,7 +173,7 @@ typedef struct ext2_file *ext2_file_t;
 #define EXT2_FLAG_EXCLUSIVE            0x4000
 #define EXT2_FLAG_SOFTSUPP_FEATURES    0x8000
 #define EXT2_FLAG_NOFREE_ON_ERROR      0x10000
-#define EXT2_FLAG_DIRECT_IO            0x20000
+#define EXT2_FLAG_DIRECT_IO            0x80000
 
 /*
  * Special flag in the ext2 inode i_flag field that means that this is