more gcc3.4 inline fixes [9/10] [1/4]
PATCH 1/1 more gcc3.4 inline fixes [9/10] [1/4]
splitted-up the fs/* gcc3.4-inline-patches.
[1/4] freevxfs, ncpfs, reiserfs
fs/freevxfs/vxfs_extern.h renamed from fs/freevxfs/vxfs_extern.h~ +1 -1
@@ -72,7 +72,7 @@/* vxfs_subr.c */ extern struct page *vxfs_get_page (struct address_space *,u_long ); -extern __inline__void vxfs_put_page (struct page *); +extern void vxfs_put_page (struct page *);extern struct buffer_head *vxfs_bread (struct inode *,int );#endif /* _VXFS_EXTERN_H_ */
fs/freevxfs/vxfs_subr.c renamed from fs/freevxfs/vxfs_subr.c~ +6 -7
@@ -50,6 +50,12 @@ .sync_page = block_sync_page, }; +__inline__void +vxfs_put_page (struct page *pp) +{ +kunmap (pp); +page_cache_release (pp); +}/** * vxfs_get_page - read a page into memory.
@@ -88,13 +94,6 @@return ERR_PTR (-EIO ); } -__inline__void -vxfs_put_page (struct page *pp) -{ -kunmap (pp); -page_cache_release (pp); -} -/** * vxfs_bread - read buffer for a give inode,block tuple * @ip: inode
fs/ncpfs/ncplib_kernel.h renamed from fs/ncpfs/ncplib_kernel.h~ +1 -1
@@ -131,7 +131,7 @@#endif /* CONFIG_NCPFS_NLS */ -inline int +int ncp_strnicmp (struct nls_table *,const unsigned char *,const unsigned char *,int );
include/linux/reiserfs_fs.h renamed from include/linux/reiserfs_fs.h~ +12 -12
@@ -1771,25 +1771,25 @@/* stree.c */ int B_IS_IN_TREE (const struct buffer_head *);extern inline void copy_short_key (void * to,const void * from); -extern inline void copy_item_head (struct item_head * p_v_to, +extern void copy_item_head (struct item_head * p_v_to,const struct item_head * p_v_from);// first key is in cpu form, second - le -extern inline int comp_keys (const struct key * le_key, +extern int comp_keys (const struct key * le_key,const struct cpu_key * cpu_key); -extern inline int comp_short_keys (const struct key * le_key, +extern int comp_short_keys (const struct key * le_key,const struct cpu_key * cpu_key); -extern inline void le_key2cpu_key (struct cpu_key * to,const struct key * from); +extern void le_key2cpu_key (struct cpu_key * to,const struct key * from);// both are cpu keys -extern inline int comp_cpu_keys (const struct cpu_key *,const struct cpu_key *); -extern inline int comp_short_cpu_keys (const struct cpu_key *, +extern int comp_cpu_keys (const struct cpu_key *,const struct cpu_key *); +extern int comp_short_cpu_keys (const struct cpu_key *,const struct cpu_key *); -extern inline void cpu_key2cpu_key (struct cpu_key *,const struct cpu_key *); +extern void cpu_key2cpu_key (struct cpu_key *,const struct cpu_key *);// both are in le form -extern inline int comp_le_keys (const struct key *,const struct key *); -extern inline int comp_short_le_keys (const struct key *,const struct key *); +extern int comp_le_keys (const struct key *,const struct key *); +extern int comp_short_le_keys (const struct key *,const struct key *);// // get key version from on disk key - kludge
@@ -1824,7 +1824,7 @@int search_for_position_by_key (struct super_block * p_s_sb,const struct cpu_key * p_s_cpu_key,struct path * p_s_search_path); -extern inline void decrement_bcount (struct buffer_head * p_s_bh); +extern void decrement_bcount (struct buffer_head * p_s_bh);void decrement_counters_in_path (struct path * p_s_search_path);void pathrelse (struct path * p_s_search_path);int reiserfs_check_path (struct path *p) ;
@@ -1902,7 +1902,7 @@void i_attrs_to_sd_attrs (struct inode *inode,__u16 *sd_attrs );/* namei.c */ -inline void set_de_name_and_namelen (struct reiserfs_dir_entry * de); +void set_de_name_and_namelen (struct reiserfs_dir_entry * de);int search_by_entry_key (struct super_block * sb,const struct cpu_key * key,struct path * path,struct reiserfs_dir_entry * de);
@@ -2050,7 +2050,7 @@ struct buffer_head **); /* do_balance.c */ -inline void do_balance_mark_leaf_dirty (struct tree_balance * tb, +void do_balance_mark_leaf_dirty (struct tree_balance * tb,struct buffer_head * bh,int flag);#define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty#define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty