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>

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 424b277f31ff23ad029d536ba3eb5baab44ed22c..2f48d25170f71675059f4034b942fef529159a6c 100644 (file)
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -474,8 +474,8 @@ void ext2_discard_reservation(struct inode *inode)
  * @block:             start physical block to free
  * @count:             number of blocks to free
  */
-void ext2_free_blocks (struct inode * inode, unsigned long block,
-                      unsigned long count)
+void ext2_free_blocks(struct inode * inode, ext2_fsblk_t block,
+                     unsigned long count)
 {
        struct buffer_head *bitmap_bh = NULL;
        struct buffer_head * bh2;

diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 26dbe579768c1d75caca9f285364f7f161cc4fc9..7fdd685c384d6ad59d936c54a113d22486b15d98 100644 (file)
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -701,12 +701,11 @@ static inline struct ext2_inode_info *EXT2_I(struct inode *inode)
 /* balloc.c */
 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 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);
 extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,
                                 unsigned int count);
-extern void ext2_free_blocks (struct inode *, unsigned long,
-                             unsigned long);
+extern void ext2_free_blocks(struct inode *, ext2_fsblk_t, unsigned long);
 extern unsigned long ext2_count_free_blocks (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,

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 39c958f7e02854f789ccdf849947877b496a3398..8ba631154243a572b3b5fa3b56d30dd432165e44 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1082,8 +1082,8 @@ no_top:
  */
 static inline void ext2_free_data(struct inode *inode, __le32 *p, __le32 *q)
 {
-       unsigned long block_to_free = 0, count = 0;
-       unsigned long nr;
+       ext2_fsblk_t block_to_free = 0, count = 0;
+       ext2_fsblk_t nr;
 
        for ( ; p < q ; 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)
 {
        struct buffer_head * bh;
-       unsigned long nr;
+       ext2_fsblk_t nr;
 
        if (depth--) {
                int addr_per_block = EXT2_ADDR_PER_BLOCK(inode->i_sb);