ext4: Fix sparse warnings. From: Aneesh Kumar K.V Fix sparse warnings related to static functions and local variables. Signed-off-by: Aneesh Kumar K.V --- fs/ext4/extents.c | 6 +++--- fs/ext4/inode.c | 18 +++++++++++------- fs/ext4/super.c | 3 +++ include/linux/ext4_fs.h | 2 ++ 4 files changed, 19 insertions(+), 10 deletions(-) Index: linux-2.6.24-rc3/fs/ext4/extents.c =================================================================== --- linux-2.6.24-rc3.orig/fs/ext4/extents.c 2007-11-30 18:30:31.000000000 -0800 +++ linux-2.6.24-rc3/fs/ext4/extents.c 2007-11-30 18:32:47.000000000 -0800 @@ -1087,7 +1087,7 @@ static ext4_lblk_t ext4_ext_next_leaf_bl * then we have to correct all indexes above. * TODO: do we need to correct tree in all cases? */ -int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode, +static int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode, struct ext4_ext_path *path) { struct ext4_extent_header *eh; @@ -1534,7 +1534,7 @@ ext4_ext_in_cache(struct inode *inode, e * It's used in truncate case only, thus all requests are for * last index in the block only. */ -int ext4_ext_rm_idx(handle_t *handle, struct inode *inode, +static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode, struct ext4_ext_path *path) { struct buffer_head *bh; @@ -1804,7 +1804,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path return 1; } -int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start) +static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start) { struct super_block *sb = inode->i_sb; int depth = ext_depth(inode); Index: linux-2.6.24-rc3/fs/ext4/inode.c =================================================================== --- linux-2.6.24-rc3.orig/fs/ext4/inode.c 2007-11-30 18:31:54.000000000 -0800 +++ linux-2.6.24-rc3/fs/ext4/inode.c 2007-11-30 18:32:05.000000000 -0800 @@ -2052,11 +2052,11 @@ static void ext4_clear_blocks(handle_t * for (p = first; p < last; p++) { u32 nr = le32_to_cpu(*p); if (nr) { - struct buffer_head *bh; + struct buffer_head *tbh; *p = 0; - bh = sb_find_get_block(inode->i_sb, nr); - ext4_forget(handle, 0, inode, bh, nr); + tbh = sb_find_get_block(inode->i_sb, nr); + ext4_forget(handle, 0, inode, tbh, nr); } } @@ -2324,8 +2324,10 @@ void ext4_truncate(struct inode *inode) return; } - if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) - return ext4_ext_truncate(inode, page); + if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) { + ext4_ext_truncate(inode, page); + return; + } handle = start_transaction(inode); if (IS_ERR(handle)) { @@ -3163,8 +3165,10 @@ ext4_reserve_inode_write(handle_t *handl * Expand an inode by new_extra_isize bytes. * Returns 0 on success or negative error number on failure. */ -int ext4_expand_extra_isize(struct inode *inode, unsigned int new_extra_isize, - struct ext4_iloc iloc, handle_t *handle) +static int ext4_expand_extra_isize(struct inode *inode, + unsigned int new_extra_isize, + struct ext4_iloc iloc, + handle_t *handle) { struct ext4_inode *raw_inode; struct ext4_xattr_ibody_header *header; Index: linux-2.6.24-rc3/fs/ext4/super.c =================================================================== --- linux-2.6.24-rc3.orig/fs/ext4/super.c 2007-11-30 18:31:56.000000000 -0800 +++ linux-2.6.24-rc3/fs/ext4/super.c 2007-11-30 18:32:05.000000000 -0800 @@ -1644,6 +1644,9 @@ static ext4_fsblk_t descriptor_loc(struc static int ext4_fill_super (struct super_block *sb, void *data, int silent) + __releases(kernel_sem) + __acquires(kernel_sem) + { struct buffer_head * bh; struct ext4_super_block *es = NULL; Index: linux-2.6.24-rc3/include/linux/ext4_fs.h =================================================================== --- linux-2.6.24-rc3.orig/include/linux/ext4_fs.h 2007-11-30 18:31:56.000000000 -0800 +++ linux-2.6.24-rc3/include/linux/ext4_fs.h 2007-11-30 18:32:05.000000000 -0800 @@ -893,6 +893,8 @@ extern ext4_fsblk_t ext4_new_block (hand ext4_fsblk_t goal, int *errp); extern ext4_fsblk_t ext4_new_blocks (handle_t *handle, struct inode *inode, ext4_fsblk_t goal, unsigned long *count, int *errp); +extern ext4_fsblk_t ext4_new_blocks_old(handle_t *handle, struct inode *inode, + ext4_fsblk_t goal, unsigned long *count, int *errp); extern void ext4_free_blocks (handle_t *handle, struct inode *inode, ext4_fsblk_t block, unsigned long count); extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb,