ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()
Theodore Ts'o
maintainerPATCH 1/6 ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()
This is a cleanup to avoid namespace leaks out of fs/ext4
--- fs/ext4/block_validity.c | 4 ++-- fs/ext4/ext4.h | 12 ++++++------ fs/ext4/mballoc.c | 4 ++-- fs/ext4/page-io.c | 4 ++-- fs/ext4/super.c | 32 ++++++++++++++++---------------- fs/ext4/xattr.c | 4 ++-- fs/ext4/xattr.h | 8 ++++---- 7 files changed, 34 insertions(+), 34 deletions(-)
fs/ext4/block_validity.c +2 -2
@@ -29,7 +29,7 @@ struct ext4_system_zone {static struct kmem_cache *ext4_system_zone_cachep; -int __init init_ext4_system_zone (void ) +int __init ext4_init_system_zone (void ) { ext4_system_zone_cachep =KMEM_CACHE (ext4_system_zone,0 );if (ext4_system_zone_cachep ==NULL )
@@ -37,7 +37,7 @@ int __init init_ext4_system_zone(void)return 0 ; } -void exit_ext4_system_zone (void ) +void ext4_exit_system_zone (void ) {kmem_cache_destroy (ext4_system_zone_cachep); }
fs/ext4/ext4.h +6 -6
@@ -1684,8 +1684,8 @@ extern ext4_fsblk_t ext4_mb_new_blocks(handle_t *, struct ext4_allocation_request *, int *);extern int ext4_mb_reserve_blocks (struct super_block *,int );extern void ext4_discard_preallocations (struct inode *); -extern int __init init_ext4_mballoc (void ); -extern void exit_ext4_mballoc (void ); +extern int __init ext4_init_mballoc (void ); +extern void ext4_exit_mballoc (void );extern void ext4_free_blocks (handle_t *handle,struct inode *inode,struct buffer_head *bh,ext4_fsblk_t block,unsigned long count,int flags);
@@ -2040,8 +2040,8 @@ extern const struct inode_operations ext4_fast_symlink_inode_operations;/* block_validity */ extern void ext4_release_system_zone (struct super_block *sb);extern int ext4_setup_system_zone (struct super_block *sb); -extern int __init init_ext4_system_zone (void ); -extern void exit_ext4_system_zone (void ); +extern int __init ext4_init_system_zone (void ); +extern void ext4_exit_system_zone (void );extern int ext4_data_block_valid (struct ext4_sb_info *sbi,ext4_fsblk_t start_blk,unsigned int count);
@@ -2070,8 +2070,8 @@ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 len, __u64 *moved_len);/* page-io.c */ -extern int __init init_ext4_pageio (void ); -extern void exit_ext4_pageio (void ); +extern int __init ext4_init_pageio (void ); +extern void ext4_exit_pageio (void );extern void ext4_free_io_end (ext4_io_end_t *io);extern ext4_io_end_t *ext4_init_io_end (struct inode *inode,gfp_t flags);extern int ext4_end_io_nolock (ext4_io_end_t *io);
fs/ext4/mballoc.c +2 -2
@@ -2705,7 +2705,7 @@ static void ext4_remove_debugfs_entry(void)#endif -int __init init_ext4_mballoc (void ) +int __init ext4_init_mballoc (void ) { ext4_pspace_cachep =KMEM_CACHE (ext4_prealloc_space,SLAB_RECLAIM_ACCOUNT );
@@ -2730,7 +2730,7 @@ int __init init_ext4_mballoc(void)return 0 ; } -void exit_ext4_mballoc (void ) +void ext4_exit_mballoc (void ) {int i;/*
fs/ext4/page-io.c +2 -2
@@ -32,7 +32,7 @@static struct kmem_cache *io_page_cachep, *io_end_cachep; -int __init init_ext4_pageio (void ) +int __init ext4_init_pageio (void ) { io_page_cachep =KMEM_CACHE (ext4_io_page,SLAB_RECLAIM_ACCOUNT );if (io_page_cachep ==NULL )
@@ -46,7 +46,7 @@ int __init init_ext4_pageio(void)return 0 ; } -void exit_ext4_pageio (void ) +void ext4_exit_pageio (void ) {kmem_cache_destroy (io_end_cachep);kmem_cache_destroy (io_page_cachep);
fs/ext4/super.c +16 -16
@@ -4768,15 +4768,15 @@ out:return ret; } -static int __init init_ext4_fs (void ) +static int __init ext4_init_fs (void ) {int err;ext4_check_flag_values (); - err =init_ext4_pageio (); + err =ext4_init_pageio ();if (err)return err; - err =init_ext4_system_zone (); + err =ext4_init_system_zone ();if (err) goto out5; ext4_kset =kset_create_and_add ("ext4" ,NULL , fs_kobj);
@@ -4786,11 +4786,11 @@ static int __init init_ext4_fs(void) err =ext4_init_feat_adverts (); - err =init_ext4_mballoc (); + err =ext4_init_mballoc ();if (err) goto out3; - err =init_ext4_xattr (); + err =ext4_init_xattr ();if (err) goto out2; err =init_inodecache ();
@@ -4810,37 +4810,37 @@ out:unregister_as_ext3 ();destroy_inodecache (); out1: -exit_ext4_xattr (); +ext4_exit_xattr (); out2: -exit_ext4_mballoc (); +ext4_exit_mballoc (); out3:kfree (ext4_feat);remove_proc_entry ("fs/ext4" ,NULL );kset_unregister (ext4_kset); out4: -exit_ext4_system_zone (); +ext4_exit_system_zone (); out5: -exit_ext4_pageio (); +ext4_exit_pageio ();return err; } -static void __exit exit_ext4_fs(void) +static void __exit ext4_exit_fs(void) {ext4_destroy_lazyinit_thread ();unregister_as_ext2 ();unregister_as_ext3 ();unregister_filesystem (&ext4_fs_type);destroy_inodecache (); -exit_ext4_xattr (); -exit_ext4_mballoc (); +ext4_exit_xattr (); +ext4_exit_mballoc ();remove_proc_entry ("fs/ext4" ,NULL );kset_unregister (ext4_kset); -exit_ext4_system_zone (); -exit_ext4_pageio (); +ext4_exit_system_zone (); +ext4_exit_pageio (); }MODULE_AUTHOR ("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others" );MODULE_DESCRIPTION ("Fourth Extended Filesystem" );MODULE_LICENSE ("GPL" ); -module_init (init_ext4_fs) -module_exit (exit_ext4_fs) +module_init (ext4_init_fs) +module_exit (ext4_exit_fs)
fs/ext4/xattr.c +2 -2
@@ -1588,7 +1588,7 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *header,#undef BLOCK_HASH_SHIFTint __init -init_ext4_xattr (void ) +ext4_init_xattr (void ) { ext4_xattr_cache =mb_cache_create ("ext4_xattr" ,6 );if (!ext4_xattr_cache)
@@ -1597,7 +1597,7 @@ init_ext4_xattr(void) }void -exit_ext4_xattr (void ) +ext4_exit_xattr (void ) {if (ext4_xattr_cache)mb_cache_destroy (ext4_xattr_cache);
fs/ext4/xattr.h +4 -4
@@ -83,8 +83,8 @@ extern void ext4_xattr_put_super(struct super_block *);extern int ext4_expand_extra_isize_ea (struct inode *inode,int new_extra_isize,struct ext4_inode *raw_inode,handle_t *handle); -extern int init_ext4_xattr (void ); -extern void exit_ext4_xattr (void ); +extern int __init ext4_init_xattr (void ); +extern void ext4_exit_xattr (void );extern const struct xattr_handler *ext4_xattr_handlers[];
@@ -121,14 +121,14 @@ ext4_xattr_put_super(struct super_block *sb) { } -static inline int +static __init inline int init_ext4_xattr (void ) {return 0 ; }static inline void -exit_ext4_xattr (void ) +ext4_exit_xattr (void ) { }
Signature · 1 line
1.7.1
Theodore Ts'o
maintainerPATCH 2/6 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.)
--- fs/ext4/balloc.c | 2 +- fs/ext4/ext4.h | 6 ------ fs/ext4/ext4_extents.h | 10 ---------- fs/ext4/extents.c | 36 ++++++++++++++++++------------------ fs/ext4/ialloc.c | 11 ++++++----- fs/ext4/inode.c | 2 +- 6 files changed, 26 insertions(+), 41 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 -6
@@ -1623,7 +1623,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 +1666,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 +1718,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 +18 -18
@@ -739,9 +739,9 @@ 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, -struct ext4_ext_path *curp, -int logical,ext4_fsblk_t ptr) +static int ext4_ext_insert_index (handle_t *handle,struct inode *inode, +struct ext4_ext_path *curp, +int logical,ext4_fsblk_t ptr) {struct ext4_extent_idx *ix;int len, err;
@@ -1232,9 +1232,9 @@ out:* 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, -ext4_lblk_t *logical,ext4_fsblk_t *phys) +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;struct ext4_extent *ex;
@@ -1297,9 +1297,9 @@ 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, -ext4_lblk_t *logical,ext4_fsblk_t *phys) +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 ;struct ext4_extent_header *eh;
@@ -1585,9 +1585,9 @@ 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 +1632,9 @@ 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 +1845,9 @@ 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 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);
@@ -414,8 +415,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 +1 -1
@@ -5543,7 +5543,7 @@ 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;
Signature · 1 line
1.7.1
Theodore Ts'o
maintainerPATCH 3/6 ext4: Rename {ext,idx}_pblock and inline small extent functions
In reply to Theodore Ts'oCleanup namespace leaks from fs/ext4 and the inline trivial functions ext4_{ext,idx}_pblock() and ext4_{ext,idx}_store_pblock() since the code size actually shrinks when we make these functions inline, they're so trivial.
--- fs/ext4/ext4_extents.h | 55 ++++++++++++++++- fs/ext4/extents.c | 160 +++++++++++++++++------------------------------- fs/ext4/migrate.c | 2 +- fs/ext4/move_extent.c | 22 +++--- 4 files changed, 121 insertions(+), 118 deletions(-)
fs/ext4/ext4_extents.h +52 -3
@@ -225,11 +225,60 @@ static inline void ext4_ext_mark_initialized(struct ext4_extent *ext) ext->ee_len =cpu_to_le16 (ext4_ext_get_actual_len (ext)); } +/* +* ext4_ext_pblock: +* combine low and high parts of physical block number into ext4_fsblk_t +*/ +static inline ext4_fsblk_t ext4_ext_pblock (struct ext4_extent *ex) +{ +ext4_fsblk_t block; + + block =le32_to_cpu (ex->ee_start_lo); + block |= ((ext4_fsblk_t )le16_to_cpu (ex->ee_start_hi) <<31 ) <<1 ; +return block; +} + +/* +* ext4_idx_pblock: +* combine low and high parts of a leaf physical block number into ext4_fsblk_t +*/ +static inline ext4_fsblk_t ext4_idx_pblock (struct ext4_extent_idx *ix) +{ +ext4_fsblk_t block; + + block =le32_to_cpu (ix->ei_leaf_lo); + block |= ((ext4_fsblk_t )le16_to_cpu (ix->ei_leaf_hi) <<31 ) <<1 ; +return block; +} + +/* +* ext4_ext_store_pblock: +* stores a large physical block number into an extent struct, +* breaking it into parts +*/ +static inline void ext4_ext_store_pblock (struct ext4_extent *ex, +ext4_fsblk_t pb) +{ + ex->ee_start_lo =cpu_to_le32 ((unsigned long ) (pb &0xffffffff )); + ex->ee_start_hi =cpu_to_le16 ((unsigned long ) ((pb >>31 ) >>1 ) & +0xffff ); +} + +/* +* ext4_idx_store_pblock: +* stores a large physical block number into an index struct, +* breaking it into parts +*/ +static inline void ext4_idx_store_pblock (struct ext4_extent_idx *ix, +ext4_fsblk_t pb) +{ + ix->ei_leaf_lo =cpu_to_le32 ((unsigned long ) (pb &0xffffffff )); + ix->ei_leaf_hi =cpu_to_le16 ((unsigned long ) ((pb >>31 ) >>1 ) & +0xffff ); +} +extern int ext4_ext_calc_metadata_amount (struct inode *inode,sector_t lblocks); -extern ext4_fsblk_t ext_pblock (struct ext4_extent *ex); -extern ext4_fsblk_t idx_pblock (struct ext4_extent_idx *); -extern void ext4_ext_store_pblock (struct ext4_extent *,ext4_fsblk_t );extern int ext4_extent_tree_init (handle_t *,struct inode *); extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int num,
fs/ext4/extents.c +57 -103
455 lines not on this page · raw message
fs/ext4/migrate.c +1 -1
@@ -412,7 +412,7 @@ static int free_ext_idx(handle_t *handle, struct inode *inode,struct buffer_head *bh;struct ext4_extent_header *eh; - block =idx_pblock (ix); + block =ext4_idx_pblock (ix); bh =sb_bread (inode->i_sb, block);if (!bh)return -EIO ;
fs/ext4/move_extent.c +11 -11
@@ -85,7 +85,7 @@ mext_next_extent(struct inode *inode, struct ext4_ext_path *path,if (EXT_LAST_EXTENT (path[ppos].p_hdr) > path[ppos].p_ext) {/* leaf block */ *extent = ++path[ppos].p_ext; - path[ppos].p_block =ext_pblock (path[ppos].p_ext); + path[ppos].p_block =ext4_ext_pblock (path[ppos].p_ext);return 0 ; }
@@ -96,7 +96,7 @@ mext_next_extent(struct inode *inode, struct ext4_ext_path *path,/* index block */ path[ppos].p_idx++; - path[ppos].p_block =idx_pblock (path[ppos].p_idx); + path[ppos].p_block =ext4_idx_pblock (path[ppos].p_idx);if (path[ppos+1 ].p_bh)brelse (path[ppos+1 ].p_bh); path[ppos+1].p_bh =
@@ -111,7 +111,7 @@ mext_next_extent(struct inode *inode, struct ext4_ext_path *path, path[cur_ppos].p_idx =EXT_FIRST_INDEX (path[cur_ppos].p_hdr); path[cur_ppos].p_block = -idx_pblock (path[cur_ppos].p_idx); +ext4_idx_pblock (path[cur_ppos].p_idx);if (path[cur_ppos+1 ].p_bh)brelse (path[cur_ppos+1 ].p_bh); path[cur_ppos+1].p_bh = sb_bread(inode->i_sb,
@@ -133,7 +133,7 @@ mext_next_extent(struct inode *inode, struct ext4_ext_path *path, path[leaf_ppos].p_ext = *extent =EXT_FIRST_EXTENT (path[leaf_ppos].p_hdr); path[leaf_ppos].p_block = -ext_pblock (path[leaf_ppos].p_ext); +ext4_ext_pblock (path[leaf_ppos].p_ext);return 0 ; } }
@@ -249,7 +249,7 @@ mext_insert_across_blocks(handle_t *handle, struct inode *orig_inode,*/ o_end->ee_block = end_ext->ee_block; o_end->ee_len = end_ext->ee_len; -ext4_ext_store_pblock (o_end,ext_pblock (end_ext)); +ext4_ext_store_pblock (o_end,ext4_ext_pblock (end_ext)); } o_start->ee_len = start_ext->ee_len;
@@ -276,7 +276,7 @@ mext_insert_across_blocks(handle_t *handle, struct inode *orig_inode,*/ o_end->ee_block = end_ext->ee_block; o_end->ee_len = end_ext->ee_len; -ext4_ext_store_pblock (o_end,ext_pblock (end_ext)); +ext4_ext_store_pblock (o_end,ext4_ext_pblock (end_ext));/* * Set 0 to the extent block if new_ext was
@@ -361,7 +361,7 @@ mext_insert_inside_block(struct ext4_extent *o_start,/* Insert new entry */ if (new_ext->ee_len) { o_start[i] = *new_ext; -ext4_ext_store_pblock (&o_start[i++],ext_pblock (new_ext)); +ext4_ext_store_pblock (&o_start[i++],ext4_ext_pblock (new_ext)); }/* Insert end entry */
@@ -488,7 +488,7 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode, start_ext.ee_len = end_ext.ee_len =0 ; new_ext.ee_block =cpu_to_le32 (*from); -ext4_ext_store_pblock (&new_ext,ext_pblock (dext)); +ext4_ext_store_pblock (&new_ext,ext4_ext_pblock (dext)); new_ext.ee_len = dext->ee_len; new_ext_alen =ext4_ext_get_actual_len (&new_ext); new_ext_end =le32_to_cpu (new_ext.ee_block) + new_ext_alen -1 ;
@@ -553,7 +553,7 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode,copy_extent_status (oext, &end_ext); end_ext_alen =ext4_ext_get_actual_len (&end_ext);ext4_ext_store_pblock (&end_ext, - (ext_pblock (o_end) + oext_alen - end_ext_alen)); + (ext4_ext_pblock (o_end) + oext_alen - end_ext_alen)); end_ext.ee_block =cpu_to_le32 (le32_to_cpu (o_end->ee_block) + oext_alen - end_ext_alen);
@@ -604,7 +604,7 @@ mext_calc_swap_extents(struct ext4_extent *tmp_dext,/* When tmp_dext is too large, pick up the target range. */ diff = donor_off -le32_to_cpu (tmp_dext->ee_block); -ext4_ext_store_pblock (tmp_dext,ext_pblock (tmp_dext) + diff); +ext4_ext_store_pblock (tmp_dext,ext4_ext_pblock (tmp_dext) + diff); tmp_dext->ee_block =cpu_to_le32 (le32_to_cpu (tmp_dext->ee_block) + diff); tmp_dext->ee_len =cpu_to_le16 (le16_to_cpu (tmp_dext->ee_len) - diff);
@@ -613,7 +613,7 @@ mext_calc_swap_extents(struct ext4_extent *tmp_dext, tmp_dext->ee_len =cpu_to_le16 (max_count); orig_diff = orig_off -le32_to_cpu (tmp_oext->ee_block); -ext4_ext_store_pblock (tmp_oext,ext_pblock (tmp_oext) + orig_diff); +ext4_ext_store_pblock (tmp_oext,ext4_ext_pblock (tmp_oext) + orig_diff);/* Adjust extent length if donor extent is larger than orig */ if (ext4_ext_get_actual_len(tmp_dext) >
Signature · 1 line
1.7.1
Theodore Ts'o
maintainerPATCH 4/6 ext4: move flush_completed_IO to fs/ext4/fsync.c and make it static
In reply to Theodore Ts'oFix a namepsace leak by moving the function to the file where it is used.
--- fs/ext4/ext4.h | 1 - fs/ext4/fsync.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/inode.c | 83 ------------------------------------------------------- 3 files changed, 83 insertions(+), 84 deletions(-)
fs/ext4/ext4.h +0 -1
@@ -1723,7 +1723,6 @@ extern int ext4_block_truncate_page(handle_t *handle, struct address_space *mapping, loff_t from);extern int ext4_page_mkwrite (struct vm_area_struct *vma,struct vm_fault *vmf);extern qsize_t *ext4_get_reserved_space (struct inode *inode); -extern int flush_completed_IO (struct inode *inode);extern void ext4_da_update_reserve_space (struct inode *inode,int used,int quota_claim);/* ioctl.c */
fs/ext4/fsync.c +83 -0
89 lines not on this page · raw message
fs/ext4/inode.c +0 -82
85 lines not on this page · raw message
Re: [PATCH 4/6] ext4: move flush_completed_IO to fs/ext4/fsync.c and make it static
Quoted 2 lines · Theodore Ts'o
Fix a namepsace leak by moving the function to the file where it is used.
namepsace => namespace
Add "and making it static." I assume.
Theodore Ts'o
maintainerPATCH 5/6 ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end()
In reply to Theodore Ts'oFix a namespace leak from fs/ext4
--- fs/ext4/balloc.c | 3 ++- fs/ext4/ext4.h | 2 +- fs/ext4/ialloc.c | 4 ++-- fs/ext4/resize.c | 7 ++++--- 4 files changed, 9 insertions(+), 7 deletions(-)
fs/ext4/balloc.c +2 -1
@@ -171,7 +171,8 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,* less than the blocksize * 8 ( which is the size * of bitmap ), set rest of the block bitmap to 1 */ -mark_bitmap_end (group_blocks, sb->s_blocksize *8 , bh->b_data); +ext4_mark_bitmap_end (group_blocks, sb->s_blocksize *8 , + bh->b_data); }return free_blocks -ext4_group_used_meta_blocks (sb, block_group, gdp); }
fs/ext4/ext4.h +1 -1
@@ -1666,7 +1666,7 @@ 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 void mark_bitmap_end (int start_bit,int end_bit,char *bitmap); +extern void ext4_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);
fs/ext4/ialloc.c +2 -2
@@ -50,7 +50,7 @@* need to use it within a single byte (to ensure we get endianness right). * We can use memset for the rest of the bitmap as there are no other users. */ -void mark_bitmap_end (int start_bit,int end_bit,char *bitmap) +void ext4_mark_bitmap_end (int start_bit,int end_bit,char *bitmap) {int i;
@@ -86,7 +86,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, }memset (bh->b_data,0 , (EXT4_INODES_PER_GROUP (sb) +7 ) /8 ); -mark_bitmap_end (EXT4_INODES_PER_GROUP (sb), sb->s_blocksize *8 , +ext4_mark_bitmap_end (EXT4_INODES_PER_GROUP (sb), sb->s_blocksize *8 , bh->b_data);return EXT4_INODES_PER_GROUP (sb);
fs/ext4/resize.c +4 -3
@@ -252,7 +252,8 @@ static int setup_new_group_blocks(struct super_block *sb,if ((err =extend_or_restart_transaction (handle,2 , bh))) goto exit_bh; -mark_bitmap_end (input->blocks_count, sb->s_blocksize *8 , bh->b_data); +ext4_mark_bitmap_end (input->blocks_count, sb->s_blocksize *8 , + bh->b_data);ext4_handle_dirty_metadata (handle,NULL , bh);brelse (bh);/* Mark unused entries in inode bitmap used */
@@ -263,8 +264,8 @@ static int setup_new_group_blocks(struct super_block *sb, goto exit_journal; } -mark_bitmap_end (EXT4_INODES_PER_GROUP (sb), sb->s_blocksize *8 , - bh->b_data); +ext4_mark_bitmap_end (EXT4_INODES_PER_GROUP (sb), sb->s_blocksize *8 , + bh->b_data);ext4_handle_dirty_metadata (handle,NULL , bh); exit_bh:brelse (bh);
Signature · 1 line
1.7.1
Theodore Ts'o
maintainerPATCH 6/6 ext4: Move ext4_mb_{get,put}_buddy_cache_lock and make them static
In reply to Theodore Ts'oThese functions are only used within fs/ext4/mballoc.c, so move them so they are used after they are defined, and then make them be static.
(Eric Sandeen submitted a similar patch but I wanted to keep commits that move codes around as separate so they can be more easily audited.)
--- fs/ext4/ext4.h | 3 - fs/ext4/mballoc.c | 157 +++++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 81 deletions(-)
fs/ext4/ext4.h +0 -3
@@ -1686,9 +1686,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 );extern int ext4_trim_fs (struct super_block *,struct fstrim_range *);/* inode.c */
fs/ext4/mballoc.c +79 -77
165 lines not on this page · raw message