From 1c25e64066e861f273b785b06ef3bc7636552eab Mon Sep 17 00:00:00 2001

From: Lukas Czerner <lczerner@redhat.com>

Date: Tue, 14 Jan 2020 09:49:19 +0100

Subject: [PATCH 5/7] Revert "libext2fs: revamp bitmap types to fix LTO

 warnings"

This reverts commit 83d9ffccf3ee6ad4e165eeb6912acf1f6149be28 because it

breaks ABI.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>

---

 lib/ext2fs/bitmaps.c      |   6 +-

 lib/ext2fs/blkmap64_ba.c  |  38 ++++----

 lib/ext2fs/blkmap64_rb.c  |  38 ++++----

 lib/ext2fs/bmap64.h       |  38 ++++----

 lib/ext2fs/ext2fs.h       |  11 +--

 lib/ext2fs/gen_bitmap.c   | 113 ++++++++---------------

 lib/ext2fs/gen_bitmap64.c | 185 ++++++++++++++++----------------------

 7 files changed, 173 insertions(+), 256 deletions(-)

diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c

index 834a3962..e0b1f7cd 100644

--- a/lib/ext2fs/bitmaps.c

+++ b/lib/ext2fs/bitmaps.c

@@ -126,7 +126,6 @@ errcode_t ext2fs_allocate_subcluster_bitmap(ext2_filsys fs,

 {

 	__u64			start, end, real_end;

 	ext2fs_generic_bitmap	bmap;

-	ext2fs_generic_bitmap_64 bmap64;

 	errcode_t		retval;

 	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);

@@ -149,15 +148,14 @@ errcode_t ext2fs_allocate_subcluster_bitmap(ext2_filsys fs,

 					   end, real_end, descr, &bmap);

 	if (retval)

 		return retval;

-	bmap64 = (ext2fs_generic_bitmap_64) bmap;

-	bmap64->cluster_bits = 0;

+	bmap->cluster_bits = 0;

 	*ret = bmap;

 	return 0;

 }

 int ext2fs_get_bitmap_granularity(ext2fs_block_bitmap bitmap)

 {

-	ext2fs_generic_bitmap_64 bmap = (ext2fs_generic_bitmap_64) bitmap;

+	ext2fs_generic_bitmap bmap = bitmap;

 	if (!EXT2FS_IS_64_BITMAP(bmap))

 		return 0;

diff --git a/lib/ext2fs/blkmap64_ba.c b/lib/ext2fs/blkmap64_ba.c

index 85cb38d2..3707a61e 100644

--- a/lib/ext2fs/blkmap64_ba.c

+++ b/lib/ext2fs/blkmap64_ba.c

@@ -40,7 +40,7 @@ struct ext2fs_ba_private_struct {

 typedef struct ext2fs_ba_private_struct *ext2fs_ba_private;

-static errcode_t ba_alloc_private_data (ext2fs_generic_bitmap_64 bitmap)

+static errcode_t ba_alloc_private_data (ext2fs_generic_bitmap bitmap)

 {

 	ext2fs_ba_private bp;

 	errcode_t	retval;

@@ -69,7 +69,7 @@ static errcode_t ba_alloc_private_data (ext2fs_generic_bitmap_64 bitmap)

 }

 static errcode_t ba_new_bmap(ext2_filsys fs EXT2FS_ATTR((unused)),

-			     ext2fs_generic_bitmap_64 bitmap)

+			     ext2fs_generic_bitmap bitmap)

 {

 	ext2fs_ba_private bp;

 	errcode_t	retval;

@@ -86,7 +86,7 @@ static errcode_t ba_new_bmap(ext2_filsys fs EXT2FS_ATTR((unused)),

 	return 0;

 }

-static void ba_free_bmap(ext2fs_generic_bitmap_64 bitmap)

+static void ba_free_bmap(ext2fs_generic_bitmap bitmap)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -101,8 +101,8 @@ static void ba_free_bmap(ext2fs_generic_bitmap_64 bitmap)

 	bp = 0;

 }

-static errcode_t ba_copy_bmap(ext2fs_generic_bitmap_64 src,

-			      ext2fs_generic_bitmap_64 dest)

+static errcode_t ba_copy_bmap(ext2fs_generic_bitmap src,

+			      ext2fs_generic_bitmap dest)

 {

 	ext2fs_ba_private src_bp = (ext2fs_ba_private) src->private;

 	ext2fs_ba_private dest_bp;

@@ -121,7 +121,7 @@ static errcode_t ba_copy_bmap(ext2fs_generic_bitmap_64 src,

 	return 0;

 }

-static errcode_t ba_resize_bmap(ext2fs_generic_bitmap_64 bmap,

+static errcode_t ba_resize_bmap(ext2fs_generic_bitmap bmap,

 				__u64 new_end, __u64 new_real_end)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bmap->private;

@@ -162,7 +162,7 @@ static errcode_t ba_resize_bmap(ext2fs_generic_bitmap_64 bmap,

 }

-static int ba_mark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int ba_mark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

 	blk64_t bitno = (blk64_t) arg;

@@ -170,7 +170,7 @@ static int ba_mark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 	return ext2fs_set_bit64(bitno - bitmap->start, bp->bitarray);

 }

-static int ba_unmark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int ba_unmark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

 	blk64_t bitno = (blk64_t) arg;

@@ -178,7 +178,7 @@ static int ba_unmark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 	return ext2fs_clear_bit64(bitno - bitmap->start, bp->bitarray);

 }

-static int ba_test_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int ba_test_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

 	blk64_t bitno = (blk64_t) arg;

@@ -186,7 +186,7 @@ static int ba_test_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 	return ext2fs_test_bit64(bitno - bitmap->start, bp->bitarray);

 }

-static void ba_mark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+static void ba_mark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,

 				unsigned int num)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -197,7 +197,7 @@ static void ba_mark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

 		ext2fs_fast_set_bit64(bitno + i - bitmap->start, bp->bitarray);

 }

-static void ba_unmark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+static void ba_unmark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,

 				  unsigned int num)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -208,7 +208,7 @@ static void ba_unmark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

 		ext2fs_fast_clear_bit64(bitno + i - bitmap->start, bp->bitarray);

 }

-static int ba_test_clear_bmap_extent(ext2fs_generic_bitmap_64 bitmap,

+static int ba_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,

 				     __u64 start, unsigned int len)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -282,7 +282,7 @@ static int ba_test_clear_bmap_extent(ext2fs_generic_bitmap_64 bitmap,

 }

-static errcode_t ba_set_bmap_range(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t ba_set_bmap_range(ext2fs_generic_bitmap bitmap,

 				     __u64 start, size_t num, void *in)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -292,7 +292,7 @@ static errcode_t ba_set_bmap_range(ext2fs_generic_bitmap_64 bitmap,

 	return 0;

 }

-static errcode_t ba_get_bmap_range(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t ba_get_bmap_range(ext2fs_generic_bitmap bitmap,

 				     __u64 start, size_t num, void *out)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -302,7 +302,7 @@ static errcode_t ba_get_bmap_range(ext2fs_generic_bitmap_64 bitmap,

 	return 0;

 }

-static void ba_clear_bmap(ext2fs_generic_bitmap_64 bitmap)

+static void ba_clear_bmap(ext2fs_generic_bitmap bitmap)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private) bitmap->private;

@@ -311,20 +311,20 @@ static void ba_clear_bmap(ext2fs_generic_bitmap_64 bitmap)

 }

 #ifdef ENABLE_BMAP_STATS

-static void ba_print_stats(ext2fs_generic_bitmap_64 bitmap)

+static void ba_print_stats(ext2fs_generic_bitmap bitmap)

 {

 	fprintf(stderr, "%16llu Bytes used by bitarray\n",

 		((bitmap->real_end - bitmap->start) >> 3) + 1 +

 		sizeof(struct ext2fs_ba_private_struct));

 }

 #else

-static void ba_print_stats(ext2fs_generic_bitmap_64 bitmap EXT2FS_ATTR((unused)))

+static void ba_print_stats(ext2fs_generic_bitmap bitmap EXT2FS_ATTR((unused)))

 {

 }

 #endif

 /* Find the first zero bit between start and end, inclusive. */

-static errcode_t ba_find_first_zero(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t ba_find_first_zero(ext2fs_generic_bitmap bitmap,

 				    __u64 start, __u64 end, __u64 *out)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private)bitmap->private;

@@ -398,7 +398,7 @@ static errcode_t ba_find_first_zero(ext2fs_generic_bitmap_64 bitmap,

 }

 /* Find the first one bit between start and end, inclusive. */

-static errcode_t ba_find_first_set(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t ba_find_first_set(ext2fs_generic_bitmap bitmap,

 				    __u64 start, __u64 end, __u64 *out)

 {

 	ext2fs_ba_private bp = (ext2fs_ba_private)bitmap->private;

diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c

index 1fd55274..4cbfb1ed 100644

--- a/lib/ext2fs/blkmap64_rb.c

+++ b/lib/ext2fs/blkmap64_rb.c

@@ -177,7 +177,7 @@ static void rb_free_extent(struct ext2fs_rb_private *bp,

 	ext2fs_free_mem(&ext;;

 }

-static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap_64 bitmap)

+static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap bitmap)

 {

 	struct ext2fs_rb_private *bp;

 	errcode_t	retval;

@@ -201,7 +201,7 @@ static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap_64 bitmap)

 }

 static errcode_t rb_new_bmap(ext2_filsys fs EXT2FS_ATTR((unused)),

-			     ext2fs_generic_bitmap_64 bitmap)

+			     ext2fs_generic_bitmap bitmap)

 {

 	errcode_t	retval;

@@ -225,7 +225,7 @@ static void rb_free_tree(struct rb_root *root)

 	}

 }

-static void rb_free_bmap(ext2fs_generic_bitmap_64 bitmap)

+static void rb_free_bmap(ext2fs_generic_bitmap bitmap)

 {

 	struct ext2fs_rb_private *bp;

@@ -236,8 +236,8 @@ static void rb_free_bmap(ext2fs_generic_bitmap_64 bitmap)

 	bp = 0;

 }

-static errcode_t rb_copy_bmap(ext2fs_generic_bitmap_64 src,

-			      ext2fs_generic_bitmap_64 dest)

+static errcode_t rb_copy_bmap(ext2fs_generic_bitmap src,

+			      ext2fs_generic_bitmap dest)

 {

 	struct ext2fs_rb_private *src_bp, *dest_bp;

 	struct bmap_rb_extent *src_ext, *dest_ext;

@@ -302,7 +302,7 @@ static void rb_truncate(__u64 new_max, struct rb_root *root)

 	}

 }

-static errcode_t rb_resize_bmap(ext2fs_generic_bitmap_64 bmap,

+static errcode_t rb_resize_bmap(ext2fs_generic_bitmap bmap,

 				__u64 new_end, __u64 new_real_end)

 {

 	struct ext2fs_rb_private *bp;

@@ -575,7 +575,7 @@ static int rb_remove_extent(__u64 start, __u64 count,

 	return retval;

 }

-static int rb_mark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int rb_mark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	struct ext2fs_rb_private *bp;

 	int retval;

@@ -588,7 +588,7 @@ static int rb_mark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 	return retval;

 }

-static int rb_unmark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int rb_unmark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	struct ext2fs_rb_private *bp;

 	int retval;

@@ -603,7 +603,7 @@ static int rb_unmark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 }

 inline

-static int rb_test_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

+static int rb_test_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)

 {

 	struct ext2fs_rb_private *bp;

@@ -613,7 +613,7 @@ static int rb_test_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)

 	return rb_test_bit(bp, arg);

 }

-static void rb_mark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+static void rb_mark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,

 				unsigned int num)

 {

 	struct ext2fs_rb_private *bp;

@@ -625,7 +625,7 @@ static void rb_mark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

 	check_tree(&bp->root, __func__);

 }

-static void rb_unmark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+static void rb_unmark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,

 				  unsigned int num)

 {

 	struct ext2fs_rb_private *bp;

@@ -637,7 +637,7 @@ static void rb_unmark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

 	check_tree(&bp->root, __func__);

 }

-static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap_64 bitmap,

+static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,

 				     __u64 start, unsigned int len)

 {

 	struct rb_node *parent = NULL, **n;

@@ -693,7 +693,7 @@ static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap_64 bitmap,

 	return retval;

 }

-static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap bitmap,

 				     __u64 start, size_t num, void *in)

 {

 	struct ext2fs_rb_private *bp;

@@ -739,7 +739,7 @@ static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap_64 bitmap,

 	return 0;

 }

-static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,

 				     __u64 start, size_t num, void *out)

 {

@@ -804,7 +804,7 @@ static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap_64 bitmap,

 	return 0;

 }

-static void rb_clear_bmap(ext2fs_generic_bitmap_64 bitmap)

+static void rb_clear_bmap(ext2fs_generic_bitmap bitmap)

 {

 	struct ext2fs_rb_private *bp;

@@ -817,7 +817,7 @@ static void rb_clear_bmap(ext2fs_generic_bitmap_64 bitmap)

 	check_tree(&bp->root, __func__);

 }

-static errcode_t rb_find_first_zero(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,

 				   __u64 start, __u64 end, __u64 *out)

 {

 	struct rb_node *parent = NULL, **n;

@@ -853,7 +853,7 @@ static errcode_t rb_find_first_zero(ext2fs_generic_bitmap_64 bitmap,

 	return 0;

 }

-static errcode_t rb_find_first_set(ext2fs_generic_bitmap_64 bitmap,

+static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,

 				   __u64 start, __u64 end, __u64 *out)

 {

 	struct rb_node *parent = NULL, **n;

@@ -902,7 +902,7 @@ static errcode_t rb_find_first_set(ext2fs_generic_bitmap_64 bitmap,

 }

 #ifdef ENABLE_BMAP_STATS

-static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap)

+static void rb_print_stats(ext2fs_generic_bitmap bitmap)

 {

 	struct ext2fs_rb_private *bp;

 	struct rb_node *node = NULL;

@@ -963,7 +963,7 @@ static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap)

 		eff);

 }

 #else

-static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap EXT2FS_ATTR((unused)))

+static void rb_print_stats(ext2fs_generic_bitmap bitmap EXT2FS_ATTR((unused)))

 {

 }

 #endif

diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h

index de334548..d8c7a3c3 100644

--- a/lib/ext2fs/bmap64.h

+++ b/lib/ext2fs/bmap64.h

@@ -37,7 +37,7 @@ struct ext2_bmap_statistics {

 };

-struct ext2fs_struct_generic_bitmap_64 {

+struct ext2fs_struct_generic_bitmap {

 	errcode_t		magic;

 	ext2_filsys 		fs;

 	struct ext2_bitmap_ops	*bitmap_ops;

@@ -53,8 +53,6 @@ struct ext2fs_struct_generic_bitmap_64 {

 #endif

 };

-typedef struct ext2fs_struct_generic_bitmap_64 *ext2fs_generic_bitmap_64;

-

 #define EXT2FS_IS_32_BITMAP(bmap) \

 	(((bmap)->magic == EXT2_ET_MAGIC_GENERIC_BITMAP) || \

 	 ((bmap)->magic == EXT2_ET_MAGIC_BLOCK_BITMAP) || \

@@ -68,37 +66,37 @@ typedef struct ext2fs_struct_generic_bitmap_64 *ext2fs_generic_bitmap_64;

 struct ext2_bitmap_ops {

 	int	type;

 	/* Generic bmap operators */

-	errcode_t (*new_bmap)(ext2_filsys fs, ext2fs_generic_bitmap_64 bmap);

-	void	(*free_bmap)(ext2fs_generic_bitmap_64 bitmap);

-	errcode_t (*copy_bmap)(ext2fs_generic_bitmap_64 src,

-			     ext2fs_generic_bitmap_64 dest);

-	errcode_t (*resize_bmap)(ext2fs_generic_bitmap_64 bitmap,

+	errcode_t (*new_bmap)(ext2_filsys fs, ext2fs_generic_bitmap bmap);

+	void	(*free_bmap)(ext2fs_generic_bitmap bitmap);

+	errcode_t (*copy_bmap)(ext2fs_generic_bitmap src,

+			     ext2fs_generic_bitmap dest);

+	errcode_t (*resize_bmap)(ext2fs_generic_bitmap bitmap,

 			       __u64 new_end,

 			       __u64 new_real_end);

 	/* bit set/test operators */

-	int	(*mark_bmap)(ext2fs_generic_bitmap_64 bitmap, __u64 arg);

-	int	(*unmark_bmap)(ext2fs_generic_bitmap_64 bitmap, __u64 arg);

-	int	(*test_bmap)(ext2fs_generic_bitmap_64 bitmap, __u64 arg);

-	void	(*mark_bmap_extent)(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+	int	(*mark_bmap)(ext2fs_generic_bitmap bitmap, __u64 arg);

+	int	(*unmark_bmap)(ext2fs_generic_bitmap bitmap, __u64 arg);

+	int	(*test_bmap)(ext2fs_generic_bitmap bitmap, __u64 arg);

+	void	(*mark_bmap_extent)(ext2fs_generic_bitmap bitmap, __u64 arg,

 				    unsigned int num);

-	void	(*unmark_bmap_extent)(ext2fs_generic_bitmap_64 bitmap, __u64 arg,

+	void	(*unmark_bmap_extent)(ext2fs_generic_bitmap bitmap, __u64 arg,

 				      unsigned int num);

-	int	(*test_clear_bmap_extent)(ext2fs_generic_bitmap_64 bitmap,

+	int	(*test_clear_bmap_extent)(ext2fs_generic_bitmap bitmap,

 					  __u64 arg, unsigned int num);

-	errcode_t (*set_bmap_range)(ext2fs_generic_bitmap_64 bitmap,

+	errcode_t (*set_bmap_range)(ext2fs_generic_bitmap bitmap,

 				    __u64 start, size_t num, void *in);

-	errcode_t (*get_bmap_range)(ext2fs_generic_bitmap_64 bitmap,

+	errcode_t (*get_bmap_range)(ext2fs_generic_bitmap bitmap,

 				    __u64 start, size_t num, void *out);

-	void (*clear_bmap)(ext2fs_generic_bitmap_64 bitmap);

-	void (*print_stats)(ext2fs_generic_bitmap_64);

+	void (*clear_bmap)(ext2fs_generic_bitmap bitmap);

+	void (*print_stats)(ext2fs_generic_bitmap);

 	/* Find the first zero bit between start and end, inclusive.

 	 * May be NULL, in which case a generic function is used. */

-	errcode_t (*find_first_zero)(ext2fs_generic_bitmap_64 bitmap,

+	errcode_t (*find_first_zero)(ext2fs_generic_bitmap bitmap,

 				     __u64 start, __u64 end, __u64 *out);

 	/* Find the first set bit between start and end, inclusive.

 	 * May be NULL, in which case a generic function is used. */

-	errcode_t (*find_first_set)(ext2fs_generic_bitmap_64 bitmap,

+	errcode_t (*find_first_set)(ext2fs_generic_bitmap bitmap,

 				    __u64 start, __u64 end, __u64 *out);

 };

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h

index 4b7c836a..ba83534c 100644

--- a/lib/ext2fs/ext2fs.h

+++ b/lib/ext2fs/ext2fs.h

@@ -111,14 +111,9 @@ typedef struct struct_ext2_filsys *ext2_filsys;

 #define EXT2FS_UNMARK_ERROR 	1

 #define EXT2FS_TEST_ERROR	2

-struct ext2fs_struct_generic_bitmap_base {

-	errcode_t		magic;

-	ext2_filsys 		fs;

-};

-

-typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_generic_bitmap;

-typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_inode_bitmap;

-typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_block_bitmap;

+typedef struct ext2fs_struct_generic_bitmap *ext2fs_generic_bitmap;

+typedef struct ext2fs_struct_generic_bitmap *ext2fs_inode_bitmap;

+typedef struct ext2fs_struct_generic_bitmap *ext2fs_block_bitmap;

 #define EXT2_FIRST_INODE(s)	EXT2_FIRST_INO(s)

diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c

index 1536d4b3..b545ed7f 100644

--- a/lib/ext2fs/gen_bitmap.c

+++ b/lib/ext2fs/gen_bitmap.c

@@ -28,7 +28,7 @@

 #include "ext2_fs.h"

 #include "ext2fsP.h"

-struct ext2fs_struct_generic_bitmap_32 {

+struct ext2fs_struct_generic_bitmap {

 	errcode_t	magic;

 	ext2_filsys 	fs;

 	__u32		start, end;

@@ -39,8 +39,6 @@ struct ext2fs_struct_generic_bitmap_32 {

 	__u32		reserved[7];

 };

-typedef struct ext2fs_struct_generic_bitmap_32 *ext2fs_generic_bitmap_32;

-

 #define EXT2FS_IS_32_BITMAP(bmap) \

 	(((bmap)->magic == EXT2_ET_MAGIC_GENERIC_BITMAP) || \

 	 ((bmap)->magic == EXT2_ET_MAGIC_BLOCK_BITMAP) || \

@@ -55,11 +53,9 @@ typedef struct ext2fs_struct_generic_bitmap_32 *ext2fs_generic_bitmap_32;

  * Used by previously inlined function, so we have to export this and

  * not change the function signature

  */

-void ext2fs_warn_bitmap2(ext2fs_generic_bitmap gen_bitmap,

+void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,

 			    int code, unsigned long arg)

 {

-	ext2fs_generic_bitmap_32 bitmap = (ext2fs_generic_bitmap_32) gen_bitmap;

-

 #ifndef OMIT_COM_ERR

 	if (bitmap->description)

 		com_err(0, bitmap->base_error_code+code,

@@ -83,11 +79,11 @@ errcode_t ext2fs_make_generic_bitmap(errcode_t magic, ext2_filsys fs,

 				     const char *descr, char *init_map,

 				     ext2fs_generic_bitmap *ret)

 {

-	ext2fs_generic_bitmap_32 bitmap;

+	ext2fs_generic_bitmap	bitmap;

 	errcode_t		retval;

 	size_t			size;

-	retval = ext2fs_get_mem(sizeof(struct ext2fs_struct_generic_bitmap_32),

+	retval = ext2fs_get_mem(sizeof(struct ext2fs_struct_generic_bitmap),

 				&bitmap);

 	if (retval)

 		return retval;

@@ -131,7 +127,7 @@ errcode_t ext2fs_make_generic_bitmap(errcode_t magic, ext2_filsys fs,

 		memcpy(bitmap->bitmap, init_map, size);

 	else

 		memset(bitmap->bitmap, 0, size);

-	*ret = (ext2fs_generic_bitmap) bitmap;

+	*ret = bitmap;

 	return 0;

 }

@@ -145,11 +141,9 @@ errcode_t ext2fs_allocate_generic_bitmap(__u32 start,

 					  start, end, real_end, descr, 0, ret);

 }

-errcode_t ext2fs_copy_generic_bitmap(ext2fs_generic_bitmap gen_src,

+errcode_t ext2fs_copy_generic_bitmap(ext2fs_generic_bitmap src,

 				     ext2fs_generic_bitmap *dest)

 {

-	ext2fs_generic_bitmap_32 src = (ext2fs_generic_bitmap_32) gen_src;

-

 	return (ext2fs_make_generic_bitmap(src->magic, src->fs,

 					   src->start, src->end,

 					   src->real_end,

@@ -157,11 +151,9 @@ errcode_t ext2fs_copy_generic_bitmap(ext2fs_generic_bitmap gen_src,

 					   dest));

 }

-void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap gen_bitmap)

+void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)

 {

-	ext2fs_generic_bitmap_32 bitmap = (ext2fs_generic_bitmap_32) gen_bitmap;

-

-	if (check_magic(gen_bitmap))

+	if (check_magic(bitmap))

 		return;

 	bitmap->magic = 0;

@@ -179,8 +171,6 @@ void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap gen_bitmap)

 int ext2fs_test_generic_bitmap(ext2fs_generic_bitmap bitmap,

 					blk_t bitno)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -193,18 +183,16 @@ int ext2fs_test_generic_bitmap(ext2fs_generic_bitmap bitmap,

 		return 0;

 	}

-	if ((bitno < bitmap32->start) || (bitno > bitmap32->end)) {

+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {

 		ext2fs_warn_bitmap2(bitmap, EXT2FS_TEST_ERROR, bitno);

 		return 0;

 	}

-	return ext2fs_test_bit(bitno - bitmap32->start, bitmap32->bitmap);

+	return ext2fs_test_bit(bitno - bitmap->start, bitmap->bitmap);

 }

 int ext2fs_mark_generic_bitmap(ext2fs_generic_bitmap bitmap,

 					 __u32 bitno)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -217,18 +205,16 @@ int ext2fs_mark_generic_bitmap(ext2fs_generic_bitmap bitmap,

 		return 0;

 	}

-	if ((bitno < bitmap32->start) || (bitno > bitmap32->end)) {

+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {

 		ext2fs_warn_bitmap2(bitmap, EXT2FS_MARK_ERROR, bitno);

 		return 0;

 	}

-	return ext2fs_set_bit(bitno - bitmap32->start, bitmap32->bitmap);

+	return ext2fs_set_bit(bitno - bitmap->start, bitmap->bitmap);

 }

 int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap,

 					   blk_t bitno)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -241,17 +227,15 @@ int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap,

 		return 0;

 	}

-	if ((bitno < bitmap32->start) || (bitno > bitmap32->end)) {

+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {

 		ext2fs_warn_bitmap2(bitmap, EXT2FS_UNMARK_ERROR, bitno);

 		return 0;

 	}

-	return ext2fs_clear_bit(bitno - bitmap32->start, bitmap32->bitmap);

+	return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap);

 }

 __u32 ext2fs_get_generic_bitmap_start(ext2fs_generic_bitmap bitmap)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -264,13 +248,11 @@ __u32 ext2fs_get_generic_bitmap_start(ext2fs_generic_bitmap bitmap)

 		return 0;

 	}

-	return bitmap32->start;

+	return bitmap->start;

 }

 __u32 ext2fs_get_generic_bitmap_end(ext2fs_generic_bitmap bitmap)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -282,13 +264,11 @@ __u32 ext2fs_get_generic_bitmap_end(ext2fs_generic_bitmap bitmap)

 #endif

 		return 0;

 	}

-	return bitmap32->end;

+	return bitmap->end;

 }

 void ext2fs_clear_generic_bitmap(ext2fs_generic_bitmap bitmap)

 {

-	ext2fs_generic_bitmap_32 bitmap32 = (ext2fs_generic_bitmap_32) bitmap;

-

 	if (!EXT2FS_IS_32_BITMAP(bitmap)) {

 		if (EXT2FS_IS_64_BITMAP(bitmap)) {

 			ext2fs_warn_bitmap32(bitmap, __func__);

@@ -302,16 +282,14 @@ void ext2fs_clear_generic_bitmap(ext2fs_generic_bitmap bitmap)

 		return;

 	}

-	memset(bitmap32->bitmap, 0,

-	       (size_t) (((bitmap32->real_end - bitmap32->start) / 8) + 1));

+	memset(bitmap->bitmap, 0,

+	       (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));

 }

-errcode_t ext2fs_fudge_generic_bitmap_end(ext2fs_inode_bitmap gen_bitmap,

+errcode_t ext2fs_fudge_generic_bitmap_end(ext2fs_inode_bitmap bitmap,

 					  errcode_t magic, errcode_t neq,

 					  ext2_ino_t end, ext2_ino_t *oend)

 {

-	ext2fs_generic_bitmap_32 bitmap = (ext2fs_generic_bitmap_32) gen_bitmap;

-

 	EXT2_CHECK_MAGIC(bitmap, magic);

 	if (end > bitmap->real_end)

@@ -324,9 +302,8 @@ errcode_t ext2fs_fudge_generic_bitmap_end(ext2fs_inode_bitmap gen_bitmap,

 errcode_t ext2fs_resize_generic_bitmap(errcode_t magic,

 				       __u32 new_end, __u32 new_real_end,

-				       ext2fs_generic_bitmap gen_bmap)

+				       ext2fs_generic_bitmap bmap)

 {

-	ext2fs_generic_bitmap_32 bmap = (ext2fs_generic_bitmap_32) gen_bmap;

 	errcode_t	retval;

 	size_t		size, new_size;

 	__u32		bitno;

@@ -367,11 +344,9 @@ errcode_t ext2fs_resize_generic_bitmap(errcode_t magic,

 }

 errcode_t ext2fs_compare_generic_bitmap(errcode_t magic, errcode_t neq,

-					ext2fs_generic_bitmap gen_bm1,

-					ext2fs_generic_bitmap gen_bm2)

+					ext2fs_generic_bitmap bm1,

+					ext2fs_generic_bitmap bm2)

 {

-	ext2fs_generic_bitmap_32 bm1 = (ext2fs_generic_bitmap_32) gen_bm1;

-	ext2fs_generic_bitmap_32 bm2 = (ext2fs_generic_bitmap_32) gen_bm2;

 	blk_t	i;

 	if (!bm1 || bm1->magic != magic)

@@ -386,16 +361,15 @@ errcode_t ext2fs_compare_generic_bitmap(errcode_t magic, errcode_t neq,

 		return neq;

 	for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)

-		if (ext2fs_fast_test_block_bitmap(gen_bm1, i) !=

-		    ext2fs_fast_test_block_bitmap(gen_bm2, i))