Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f109d5a authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: make various ext4 functions be static 



These functions have no need to be exported beyond file context.

No functions needed to be moved for this commit; just some function
declarations changed to be static and removed from header files.

(A similar patch was submitted by Eric Sandeen, but I wanted to handle
code movement in separate patches to make sure code changes didn't
accidentally get dropped.)

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 5dabfc78

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
 * 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 −8
Original line number Diff line number Diff line
@@ -1558,8 +1558,6 @@ ext4_group_first_block_no(struct super_block *sb, ext4_group_t group_no) 
void ext4_get_group_no_and_offset(struct super_block *sb, ext4_fsblk_t blocknr,

			ext4_group_t *blockgrpp, ext4_grpblk_t *offsetp);



extern struct proc_dir_entry *ext4_proc_root;



/*

 * Timeout and state flag for lazy initialization inode thread.

 */
@@ -1623,7 +1621,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 *);
@@ -1667,10 +1664,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);

extern int ext4_init_inode_table(struct super_block *sb,

				 ext4_group_t group, int barrier);
@@ -1723,7 +1716,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
Original line number Diff line number Diff line
@@ -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

+18 −18
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block, 
 * 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,8 +1232,8 @@ static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode, 
 * returns 0 at @phys

 * return value contains 0 (success) or error code

 */

int

ext4_ext_search_left(struct inode *inode, struct ext4_ext_path *path,

static int ext4_ext_search_left(struct inode *inode,

				struct ext4_ext_path *path,

				ext4_lblk_t *logical, ext4_fsblk_t *phys)

{

	struct ext4_extent_idx *ix;
@@ -1297,8 +1297,8 @@ 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

ext4_ext_search_right(struct inode *inode, struct ext4_ext_path *path,

static int ext4_ext_search_right(struct inode *inode,

				 struct ext4_ext_path *path,

				 ext4_lblk_t *logical, ext4_fsblk_t *phys)

{

	struct buffer_head *bh = NULL;
@@ -1585,7 +1585,7 @@ 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,

static int ext4_ext_try_to_merge(struct inode *inode,

				 struct ext4_ext_path *path,

				 struct ext4_extent *ex)

{
@@ -1632,7 +1632,7 @@ 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,

static unsigned int ext4_ext_check_overlap(struct inode *inode,

					   struct ext4_extent *newext,

					   struct ext4_ext_path *path)

{
@@ -1845,7 +1845,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
	return err;

}



int ext4_ext_walk_space(struct inode *inode, ext4_lblk_t block,

static int ext4_ext_walk_space(struct inode *inode, ext4_lblk_t block,

			       ext4_lblk_t num, ext_prepare_callback func,

			       void *cbdata)

{

fs/ext4/ialloc.c

+6 −5
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 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,

static unsigned ext4_init_inode_bitmap(struct super_block *sb,

				       struct buffer_head *bh,

				       ext4_group_t block_group,

				       struct ext4_group_desc *gdp)

{
@@ -414,7 +415,7 @@ 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,

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;