While trying to forward patch the vserver stuff over to 2.6.27-rc1 in my
git tree (from 2.6.26)
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
and looking at the conflict, it is basically on line 548 or so,
....
#define EXT4_MOUNT_EXTENTS 0x400000 /* Extents support */
#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
#define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */
#define EXT4_MOUNT_MBALLOC 0x4000000 /* Buddy allocation
support */
#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */
#define EXT4_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
....
As you can see, the EXT4_MOUNT_TAGGED flag same value as
EXT4_MOUNT_JOURNAL_ASYNC_COMMIT flag. Seems a little bit of a problem.
And basically all the bits are now used up on 32-bit processors (flag is
unsigned long).
Ideas? Or am I reading this wrong?
- Adam