ext4: make static functions static & remove prototypes
PATCH 1/2 ext4: make static functions static & remove prototypes
Just a tidyup; many functions are used in only one file, and yet are not marked static, and have prototypes in headers. In 2 cases in mballoc.c I moved the function ahead of its first use.
Signed-off-by Eric Sandeen <[email protected]>
---
balloc.c | 2 ext4.h | 9 --- ext4_extents.h | 10 --- extents.c | 27 +++++---- ialloc.c | 11 ++- inode.c | 3 - mballoc.c | 157 ++++++++++++++++++++++++++++----------------------------- 7 files changed, 103 insertions(+), 116 deletions(-)
fs/ext4/balloc.c +1 -1
@@ -489,7 +489,7 @@ error_return:* Check if filesystem has nblocks free & available for allocation. * On success return 1, return 0 on failure. */ -int ext4_has_free_blocks (struct ext4_sb_info *sbi,s64 nblocks) +static int ext4_has_free_blocks (struct ext4_sb_info *sbi,s64 nblocks) {s64 free_blocks, dirty_blocks, root_blocks;struct percpu_counter *fbc = &sbi->s_freeblocks_counter;
fs/ext4/ext4.h +0 -9
@@ -1561,7 +1561,6 @@ extern unsigned long ext4_bg_num_gdb(struct super_block *sb,extern ext4_fsblk_t ext4_new_meta_blocks (handle_t *handle,struct inode *inode,ext4_fsblk_t goal,unsigned long *count,int *errp);extern int ext4_claim_free_blocks (struct ext4_sb_info *sbi,s64 nblocks); -extern int ext4_has_free_blocks (struct ext4_sb_info *sbi,s64 nblocks);extern void ext4_add_groupblocks (handle_t *handle,struct super_block *sb,ext4_fsblk_t block,unsigned long count);extern ext4_fsblk_t ext4_count_free_blocks (struct super_block *);
@@ -1605,10 +1604,6 @@ extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);extern unsigned long ext4_count_free_inodes (struct super_block *);extern unsigned long ext4_count_dirs (struct super_block *);extern void ext4_check_inodes_bitmap (struct super_block *); -extern unsigned ext4_init_inode_bitmap (struct super_block *sb, -struct buffer_head *bh, -ext4_group_t group, -struct ext4_group_desc *desc);extern void mark_bitmap_end (int start_bit,int end_bit,char *bitmap);/* mballoc.c */
@@ -1627,9 +1622,6 @@ extern void ext4_free_blocks(handle_t *handle, struct inode *inode, unsigned long count, int flags);extern int ext4_mb_add_groupinfo (struct super_block *sb,ext4_group_t i,struct ext4_group_desc *desc); -extern int ext4_mb_get_buddy_cache_lock (struct super_block *,ext4_group_t ); -extern void ext4_mb_put_buddy_cache_lock (struct super_block *, -ext4_group_t ,int );/* inode.c */ struct buffer_head *ext4_getblk (handle_t *,struct inode *,ext4_lblk_t ,int ,int *);
@@ -1657,7 +1649,6 @@ extern void ext4_get_inode_flags(struct ext4_inode_info *);extern int ext4_alloc_da_blocks (struct inode *inode);extern void ext4_set_aops (struct inode *inode);extern int ext4_writepage_trans_blocks (struct inode *); -extern int ext4_meta_trans_blocks (struct inode *,int nrblocks,int idxblocks);extern int ext4_chunk_trans_blocks (struct inode *,int nrblocks);extern int ext4_block_truncate_page (handle_t *handle,struct address_space *mapping,loff_t from);
fs/ext4/ext4_extents.h +0 -10
@@ -237,19 +237,9 @@ extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,extern int ext4_can_extents_be_merged (struct inode *inode,struct ext4_extent *ex1,struct ext4_extent *ex2); -extern int ext4_ext_try_to_merge (struct inode *inode, -struct ext4_ext_path *path, -struct ext4_extent *); -extern unsigned int ext4_ext_check_overlap (struct inode *,struct ext4_extent *,struct ext4_ext_path *);extern int ext4_ext_insert_extent (handle_t *,struct inode *,struct ext4_ext_path *,struct ext4_extent *,int ); -extern int ext4_ext_walk_space (struct inode *,ext4_lblk_t ,ext4_lblk_t , -ext_prepare_callback ,void *);extern struct ext4_ext_path *ext4_ext_find_extent (struct inode *,ext4_lblk_t ,struct ext4_ext_path *); -extern int ext4_ext_search_left (struct inode *,struct ext4_ext_path *, -ext4_lblk_t *,ext4_fsblk_t *); -extern int ext4_ext_search_right (struct inode *,struct ext4_ext_path *, -ext4_lblk_t *,ext4_fsblk_t *);extern void ext4_ext_drop_refs (struct ext4_ext_path *);extern int ext4_ext_check_inode (struct inode *inode);#endif /* _EXT4_EXTENTS */
fs/ext4/extents.c +15 -12
@@ -739,7 +739,7 @@ err:* insert new index [@logical;@ptr] into the block at @curp; * check where to insert: before @curp or after @curp */ -int ext4_ext_insert_index (handle_t *handle,struct inode *inode, +static int ext4_ext_insert_index (handle_t *handle,struct inode *inode,struct ext4_ext_path *curp,int logical,ext4_fsblk_t ptr) {
@@ -1232,7 +1232,7 @@ out:* returns 0 at @phys * return value contains 0 (success) or error code */ -int +static int ext4_ext_search_left (struct inode *inode,struct ext4_ext_path *path,ext4_lblk_t *logical,ext4_fsblk_t *phys) {
@@ -1297,7 +1297,7 @@ ext4_ext_search_left(struct inode *inode, struct ext4_ext_path *path,* returns 0 at @phys * return value contains 0 (success) or error code */ -int +static int ext4_ext_search_right (struct inode *inode,struct ext4_ext_path *path,ext4_lblk_t *logical,ext4_fsblk_t *phys) {
@@ -1585,9 +1585,10 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,* Returns 0 if the extents (ex and ex+1) were _not_ merged and returns * 1 if they got merged. */ -int ext4_ext_try_to_merge (struct inode *inode, -struct ext4_ext_path *path, -struct ext4_extent *ex) +static int +ext4_ext_try_to_merge (struct inode *inode, +struct ext4_ext_path *path, +struct ext4_extent *ex) {struct ext4_extent_header *eh;unsigned int depth, len;
@@ -1632,9 +1633,10 @@ int ext4_ext_try_to_merge(struct inode *inode,* such that there will be no overlap, and then returns 1. * If there is no overlap found, it returns 0. */ -unsigned int ext4_ext_check_overlap (struct inode *inode, -struct ext4_extent *newext, -struct ext4_ext_path *path) +static unsigned int +ext4_ext_check_overlap (struct inode *inode, +struct ext4_extent *newext, +struct ext4_ext_path *path) {ext4_lblk_t b1, b2;unsigned int depth, len1;
@@ -1845,9 +1847,10 @@ cleanup:return err; } -int ext4_ext_walk_space (struct inode *inode,ext4_lblk_t block, -ext4_lblk_t num,ext_prepare_callback func, -void *cbdata) +static int +ext4_ext_walk_space (struct inode *inode,ext4_lblk_t block, +ext4_lblk_t num,ext_prepare_callback func, +void *cbdata) {struct ext4_ext_path *path =NULL ;struct ext4_ext_cache cbex;
fs/ext4/ialloc.c +6 -5
@@ -65,9 +65,10 @@ void mark_bitmap_end(int start_bit, int end_bit, char *bitmap) }/* Initializes an uninitialized inode bitmap */ -unsigned ext4_init_inode_bitmap (struct super_block *sb,struct buffer_head *bh, -ext4_group_t block_group, -struct ext4_group_desc *gdp) +static unsigned long +ext4_init_inode_bitmap (struct super_block *sb,struct buffer_head *bh, +ext4_group_t block_group, +struct ext4_group_desc *gdp) {struct ext4_sb_info *sbi =EXT4_SB (sb);
@@ -411,8 +412,8 @@ struct orlov_stats {* for a particular block group or flex_bg. If flex_size is 1, then g * is a block group number; otherwise it is flex_bg number. */ -void get_orlov_stats (struct super_block *sb,ext4_group_t g, -int flex_size,struct orlov_stats *stats) +static void get_orlov_stats (struct super_block *sb,ext4_group_t g, +int flex_size,struct orlov_stats *stats) {struct ext4_group_desc *desc;struct flex_groups *flex_group =EXT4_SB (sb)->s_flex_groups;
fs/ext4/inode.c +2 -1
@@ -5643,7 +5643,8 @@ static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk)* * Also account for superblock, inode, quota and xattr blocks */ -int ext4_meta_trans_blocks (struct inode *inode,int nrblocks,int chunk) +static int +ext4_meta_trans_blocks (struct inode *inode,int nrblocks,int chunk) {ext4_group_t groups, ngroups =ext4_get_groups_count (inode->i_sb);int gdpblocks;
fs/ext4/mballoc.c +79 -77
165 lines not on this page · raw message