2008-06-17 07:13:57

by Shen Feng

[permalink] [raw]
Subject: [PATCH] ext4: Fix the error declaration of ext4_mb_free_blocks

The third parameter @block of ext4_mb_free_blocks is
declared as unsigned long. But it should be
ext4_fsblk_t.

Signed-off-by: Shen Feng <[email protected]>
---
fs/ext4/ext4.h | 2 +-
fs/ext4/mballoc.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8158083..30cfb20 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1015,7 +1015,7 @@ extern void ext4_mb_discard_inode_preallocations(struct inode *);
extern int __init init_ext4_mballoc(void);
extern void exit_ext4_mballoc(void);
extern void ext4_mb_free_blocks(handle_t *, struct inode *,
- unsigned long, unsigned long, int, unsigned long *);
+ ext4_fsblk_t, unsigned long, int, unsigned long *);


/* inode.c */
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index c9900aa..5fa1b7c 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4189,7 +4189,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,
* Main entry point into mballoc to free blocks
*/
void ext4_mb_free_blocks(handle_t *handle, struct inode *inode,
- unsigned long block, unsigned long count,
+ ext4_fsblk_t block, unsigned long count,
int metadata, unsigned long *freed)
{
struct buffer_head *bitmap_bh = NULL;
@@ -4217,11 +4217,11 @@ void ext4_mb_free_blocks(handle_t *handle, struct inode *inode,
block + count > ext4_blocks_count(es)) {
ext4_error(sb, __func__,
"Freeing blocks not in datazone - "
- "block = %lu, count = %lu", block, count);
+ "block = %llu, count = %lu", block, count);
goto error_return;
}

- ext4_debug("freeing block %lu\n", block);
+ ext4_debug("freeing block %llu\n", block);

ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
if (ac) {
@@ -4258,7 +4258,7 @@ do_more:

ext4_error(sb, __func__,
"Freeing blocks in system zone - "
- "Block = %lu, count = %lu", block, count);
+ "Block = %llu, count = %lu", block, count);
/* err = 0. ext4_std_error should be a no op */
goto error_return;
}
--
1.5.5.1