[PATCH] ext3_fsblk_t: the rest of in-kernel filesystem blocks conversion

Convert the ext3 in-kernel filesystem blocks to ext3_fsblk_t.  Convert the
rest of all unsigned long type in-kernel filesystem blocks to ext3_fsblk_t,
and replace the printk format string respondingly.

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 14 insertions, 6 deletions

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 34136ff02aca..5607e6457a65 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -710,6 +710,14 @@ struct dir_private_info {
         __u32           next_hash;
 };
 
+/* calculate the first block number of the group */
+static inline ext3_fsblk_t
+ext3_group_first_block_no(struct super_block *sb, unsigned long group_no)
+{
+        return group_no * (ext3_fsblk_t)EXT3_BLOCKS_PER_GROUP(sb) +
+                le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block);
+}
+
 /*
  * Special error return code only used by dx_probe() and its callers.
  */
@@ -739,7 +747,7 @@ extern void ext3_free_blocks (handle_t *handle, struct inode *inode,
 extern void ext3_free_blocks_sb (handle_t *handle, struct super_block *sb,
                                  ext3_fsblk_t block, unsigned long count,
                                 unsigned long *pdquot_freed_blocks);
-extern unsigned long ext3_count_free_blocks (struct super_block *);
+extern ext3_fsblk_t ext3_count_free_blocks (struct super_block *);
 extern void ext3_check_blocks_bitmap (struct super_block *);
 extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb,
                                                     unsigned int block_group,
@@ -811,7 +819,7 @@ extern int ext3_group_add(struct super_block *sb,
                                 struct ext3_new_group_data *input);
 extern int ext3_group_extend(struct super_block *sb,
                                 struct ext3_super_block *es,
-                                unsigned long n_blocks_count);
+                                ext3_fsblk_t n_blocks_count);
 
 /* super.c */
 extern void ext3_error (struct super_block *, const char *, const char *, ...)
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index e1c7509c0c9f..2f18b9511f21 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -30,8 +30,8 @@ typedef unsigned long ext3_fsblk_t;
 #define E3FSBLK "%lu"
 
 struct ext3_reserve_window {
-        __u32                   _rsv_start;     /* First byte reserved */
-        __u32                   _rsv_end;       /* Last byte reserved or 0 */
+        ext3_fsblk_t    _rsv_start;     /* First byte reserved */
+        ext3_fsblk_t    _rsv_end;       /* Last byte reserved or 0 */
 };
 
 struct ext3_reserve_window_node {
@@ -58,7 +58,7 @@ struct ext3_block_alloc_info {
          * allocated to this file.  This give us the goal (target) for the next
          * allocation when we detect linearly ascending requests.
          */
-        __u32                   last_alloc_physical_block;
+        ext3_fsblk_t            last_alloc_physical_block;
 };
 
 #define rsv_start rsv_window._rsv_start
@@ -75,7 +75,7 @@ struct ext3_inode_info {
         __u8    i_frag_no;
         __u8    i_frag_size;
 #endif
-        __u32   i_file_acl;
+        ext3_fsblk_t    i_file_acl;
         __u32   i_dir_acl;
         __u32   i_dtime;