diff options
author | Mingming <cmm@us.ibm.com> | 2009-09-01 08:44:37 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-01 08:44:37 -0400 |
commit | 84fe3bef59dc45a1cb0d2f9b0aefa8f1fbfbdf98 (patch) | |
tree | 2e6821186ace260d61d32774c5976e233e660a88 /fs | |
parent | 50797481a7bdee548589506d7d7b48b08bc14dcd (diff) |
ext4: Compile warning fix when EXT_DEBUG enabled
When EXT_DEBUG is enabled I received the following compile warning on
PPC64:
CC [M] fs/ext4/inode.o
CC [M] fs/ext4/extents.o
fs/ext4/extents.c: In function ‘ext4_ext_rm_leaf’:
fs/ext4/extents.c:2097: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 2 has type ‘ext4_lblk_t’
fs/ext4/extents.c: In function ‘ext4_ext_get_blocks’:
fs/ext4/extents.c:2789: warning: format ‘%u’ expects type ‘unsigned int’, but argument 4 has type ‘long unsigned int’
fs/ext4/extents.c:2852: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 3 has type ‘ext4_lblk_t’
fs/ext4/extents.c:2953: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘unsigned int’
CC [M] fs/ext4/migrate.o
The patch fixes compile warning.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Index: linux-2.6.31-rc4/fs/ext4/extents.c
===================================================================
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/extents.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 73ebfb44ad75..c583ebd1e41f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -2094,7 +2094,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, | |||
2094 | else | 2094 | else |
2095 | uninitialized = 0; | 2095 | uninitialized = 0; |
2096 | 2096 | ||
2097 | ext_debug("remove ext %lu:%u\n", ex_ee_block, ex_ee_len); | 2097 | ext_debug("remove ext %u:%d\n", ex_ee_block, ex_ee_len); |
2098 | path[depth].p_ext = ex; | 2098 | path[depth].p_ext = ex; |
2099 | 2099 | ||
2100 | a = ex_ee_block > start ? ex_ee_block : start; | 2100 | a = ex_ee_block > start ? ex_ee_block : start; |
@@ -2786,7 +2786,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | |||
2786 | struct ext4_allocation_request ar; | 2786 | struct ext4_allocation_request ar; |
2787 | 2787 | ||
2788 | __clear_bit(BH_New, &bh_result->b_state); | 2788 | __clear_bit(BH_New, &bh_result->b_state); |
2789 | ext_debug("blocks %u/%u requested for inode %u\n", | 2789 | ext_debug("blocks %u/%u requested for inode %lu\n", |
2790 | iblock, max_blocks, inode->i_ino); | 2790 | iblock, max_blocks, inode->i_ino); |
2791 | 2791 | ||
2792 | /* check in cache */ | 2792 | /* check in cache */ |
@@ -2849,7 +2849,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | |||
2849 | newblock = iblock - ee_block + ee_start; | 2849 | newblock = iblock - ee_block + ee_start; |
2850 | /* number of remaining blocks in the extent */ | 2850 | /* number of remaining blocks in the extent */ |
2851 | allocated = ee_len - (iblock - ee_block); | 2851 | allocated = ee_len - (iblock - ee_block); |
2852 | ext_debug("%u fit into %lu:%d -> %llu\n", iblock, | 2852 | ext_debug("%u fit into %u:%d -> %llu\n", iblock, |
2853 | ee_block, ee_len, newblock); | 2853 | ee_block, ee_len, newblock); |
2854 | 2854 | ||
2855 | /* Do not put uninitialized extent in the cache */ | 2855 | /* Do not put uninitialized extent in the cache */ |
@@ -2950,7 +2950,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | |||
2950 | newblock = ext4_mb_new_blocks(handle, &ar, &err); | 2950 | newblock = ext4_mb_new_blocks(handle, &ar, &err); |
2951 | if (!newblock) | 2951 | if (!newblock) |
2952 | goto out2; | 2952 | goto out2; |
2953 | ext_debug("allocate new block: goal %llu, found %llu/%lu\n", | 2953 | ext_debug("allocate new block: goal %llu, found %llu/%u\n", |
2954 | ar.goal, newblock, allocated); | 2954 | ar.goal, newblock, allocated); |
2955 | 2955 | ||
2956 | /* try to insert new extent into found leaf and return */ | 2956 | /* try to insert new extent into found leaf and return */ |