[PATCH] ext4: move block number hi bits

move '_hi' bits of block numbers in the larger part of the
block group descriptor structure

Signed-off-by: Alexandre Ratchov <alexandre.ratchov@bull.net>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --cc fs/ext4/balloc.c
Simple merge

diff --cc fs/ext4/ialloc.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/resize.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/ext4_fs.h
Simple merge