From: Jose R. Santos <jrs@xxxxxxxxxx> Move ext2fs_struct_generic_bitmap back into ext2fs.h In Commit: f1f115a78f5ea599fc5f8815a741d43fedd5840d The ext2fs_struct_generic_bitmap structure is remove from ext2fs.h and put into gen_bitmap.c. This breaks big endian compiles since swapfs.c uses this structure as well if EXT2_BIG_ENDIAN_BITMAPS is defined. Since we have multiple users, this patch move ext2fs_struct_generic_bitmap back into ext2fs.h in order to compile on PowerPC or other big endian archs. Signed-off-by: Jose R. Santos <jrs@xxxxxxxxxx> -- lib/ext2fs/ext2fs.h | 11 +++++++++++ lib/ext2fs/gen_bitmap.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index d1cda2f..f34d2f9 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -100,6 +100,17 @@ typedef __u32 ext2_dirhash_t; typedef struct struct_ext2_filsys *ext2_filsys; +struct ext2fs_struct_generic_bitmap { + errcode_t magic; + ext2_filsys fs; + __u32 start, end; + __u32 real_end; + char * description; + char * bitmap; + errcode_t base_error_code; + __u32 reserved[7]; +}; + #define EXT2FS_MARK_ERROR 0 #define EXT2FS_UNMARK_ERROR 1 #define EXT2FS_TEST_ERROR 2 diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c index 66172e5..3d01149 100644 --- a/lib/ext2fs/gen_bitmap.c +++ b/lib/ext2fs/gen_bitmap.c @@ -27,17 +27,6 @@ #include "ext2_fs.h" #include "ext2fs.h" -struct ext2fs_struct_generic_bitmap { - errcode_t magic; - ext2_filsys fs; - __u32 start, end; - __u32 real_end; - char * description; - char * bitmap; - errcode_t base_error_code; - __u32 reserved[7]; -}; - /* * Used by previously inlined function, so we have to export this and * not change the function signature - To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html