Commit 2ebc736c authored Aug 17, 2023 by Georg Ottinger Committed by Jan Kara Aug 18, 2023

ext2: improve consistency of ext2_fsblk_t datatype usage



The ext2 block allocation/deallocation functions and their respective
calls use a mixture of unsigned long and ext2_fsblk_t datatypes to
index the desired ext2 block. This commit replaces occurrences of
unsigned long with ext2_fsblk_t, covering the functions
ext2_new_block(), ext2_new_blocks(), ext2_free_blocks(),
ext2_free_data() and ext2_free_branches(). This commit is rather
conservative, and only replaces unsigned long with ext2_fsblk_t if
the variable is used to index a specific ext2 block.

Signed-off-by: Georg Ottinger <g.ottinger@gmx.at>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230817195925.10268-1-g.ottinger@gmx.at>

parent 9bc6fc33

fs/ext2/balloc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -474,7 +474,7 @@ void ext2_discard_reservation(struct inode *inode)
	* @block: start physical block to free		* @block: start physical block to free
	* @count: number of blocks to free		* @count: number of blocks to free
	*/		*/
	void ext2_free_blocks (struct inode * inode, unsigned long block,		void ext2_free_blocks(struct inode * inode, ext2_fsblk_t block,
	unsigned long count)		unsigned long count)
	{		{
	struct buffer_head *bitmap_bh = NULL;		struct buffer_head *bitmap_bh = NULL;

fs/ext2/ext2.h

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -701,12 +701,11 @@ static inline struct ext2_inode_info EXT2_I(struct inode inode)
	/* balloc.c */		/* balloc.c */
	extern int ext2_bg_has_super(struct super_block *sb, int group);		extern int ext2_bg_has_super(struct super_block *sb, int group);
	extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group);		extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group);
	extern ext2_fsblk_t ext2_new_blocks(struct inode *, unsigned long,		extern ext2_fsblk_t ext2_new_blocks(struct inode *, ext2_fsblk_t,
	unsigned long , int , unsigned int);		unsigned long , int , unsigned int);
	extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,		extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,
	unsigned int count);		unsigned int count);
	extern void ext2_free_blocks (struct inode *, unsigned long,		extern void ext2_free_blocks(struct inode *, ext2_fsblk_t, unsigned long);
	unsigned long);
	extern unsigned long ext2_count_free_blocks (struct super_block *);		extern unsigned long ext2_count_free_blocks (struct super_block *);
	extern unsigned long ext2_count_dirs (struct super_block *);		extern unsigned long ext2_count_dirs (struct super_block *);
	extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,		extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,

fs/ext2/inode.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1082,8 +1082,8 @@ static Indirect ext2_find_shared(struct inode inode,
	*/		*/
	static inline void ext2_free_data(struct inode inode, __le32 p, __le32 *q)		static inline void ext2_free_data(struct inode inode, __le32 p, __le32 *q)
	{		{
	unsigned long block_to_free = 0, count = 0;		ext2_fsblk_t block_to_free = 0, count = 0;
	unsigned long nr;		ext2_fsblk_t nr;

	for ( ; p < q ; p++) {		for ( ; p < q ; p++) {
	nr = le32_to_cpu(*p);		nr = le32_to_cpu(*p);
	@@ -1123,7 +1123,7 @@ static inline void ext2_free_data(struct inode inode, __le32 p, __le32 *q)
	static void ext2_free_branches(struct inode inode, __le32 p, __le32 *q, int depth)		static void ext2_free_branches(struct inode inode, __le32 p, __le32 *q, int depth)
	{		{
	struct buffer_head * bh;		struct buffer_head * bh;
	unsigned long nr;		ext2_fsblk_t nr;

	if (depth--) {		if (depth--) {
	int addr_per_block = EXT2_ADDR_PER_BLOCK(inode->i_sb);		int addr_per_block = EXT2_ADDR_PER_BLOCK(inode->i_sb);