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

Commit 09b88252 authored by Avantika Mathur's avatar Avantika Mathur Committed by Linus Torvalds
Browse files

[PATCH] ext4: Eliminate inline functions 



Removes all inline keywords, since the compiler will make static functions
inline when it is appropriate.

Signed-off-by: default avatarAvantika Mathur <mathur@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5d4958f9

fs/ext4/extents.c

+14 −14
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 * ext_pblock:

 * combine low and high parts of physical block number into ext4_fsblk_t

 */

static inline ext4_fsblk_t ext_pblock(struct ext4_extent *ex)

static ext4_fsblk_t ext_pblock(struct ext4_extent *ex)

{

	ext4_fsblk_t block;
@@ -61,7 +61,7 @@ static inline ext4_fsblk_t ext_pblock(struct ext4_extent *ex) 
 * idx_pblock:

 * combine low and high parts of a leaf physical block number into ext4_fsblk_t

 */

static inline ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix)

static ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix)

{

	ext4_fsblk_t block;
@@ -75,7 +75,7 @@ static inline ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix) 
 * 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)

static void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)

{

	ex->ee_start = cpu_to_le32((unsigned long) (pb & 0xffffffff));

	ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
@@ -86,7 +86,7 @@ static inline void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb 
 * 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)

static void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb)

{

	ix->ei_leaf = cpu_to_le32((unsigned long) (pb & 0xffffffff));

	ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
@@ -216,7 +216,7 @@ ext4_ext_new_block(handle_t *handle, struct inode *inode, 
	return newblock;

}



static inline int ext4_ext_space_block(struct inode *inode)

static int ext4_ext_space_block(struct inode *inode)

{

	int size;
@@ -229,7 +229,7 @@ static inline int ext4_ext_space_block(struct inode *inode) 
	return size;

}



static inline int ext4_ext_space_block_idx(struct inode *inode)

static int ext4_ext_space_block_idx(struct inode *inode)

{

	int size;
@@ -242,7 +242,7 @@ static inline int ext4_ext_space_block_idx(struct inode *inode) 
	return size;

}



static inline int ext4_ext_space_root(struct inode *inode)

static int ext4_ext_space_root(struct inode *inode)

{

	int size;
@@ -256,7 +256,7 @@ static inline int ext4_ext_space_root(struct inode *inode) 
	return size;

}



static inline int ext4_ext_space_root_idx(struct inode *inode)

static int ext4_ext_space_root_idx(struct inode *inode)

{

	int size;
@@ -1103,7 +1103,7 @@ int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode, 
	return err;

}



static int inline

static int

ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,

				struct ext4_extent *ex2)

{
@@ -1395,7 +1395,7 @@ int ext4_ext_walk_space(struct inode *inode, unsigned long block, 
	return err;

}



static inline void

static void

ext4_ext_put_in_cache(struct inode *inode, __u32 block,

			__u32 len, __u32 start, int type)

{
@@ -1413,7 +1413,7 @@ ext4_ext_put_in_cache(struct inode *inode, __u32 block, 
 * calculate boundaries of the gap that the requested block fits into

 * and cache this gap

 */

static inline void

static void

ext4_ext_put_gap_in_cache(struct inode *inode, struct ext4_ext_path *path,

				unsigned long block)

{
@@ -1454,7 +1454,7 @@ ext4_ext_put_gap_in_cache(struct inode *inode, struct ext4_ext_path *path, 
	ext4_ext_put_in_cache(inode, lblock, len, 0, EXT4_EXT_CACHE_GAP);

}



static inline int

static int

ext4_ext_in_cache(struct inode *inode, unsigned long block,

			struct ext4_extent *ex)

{
@@ -1523,7 +1523,7 @@ int ext4_ext_rm_idx(handle_t *handle, struct inode *inode, 
 * the caller should calculate credits under truncate_mutex and

 * pass the actual path.

 */

int inline ext4_ext_calc_credits_for_insert(struct inode *inode,

int ext4_ext_calc_credits_for_insert(struct inode *inode,

						struct ext4_ext_path *path)

{

	int depth, needed;
@@ -1733,7 +1733,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, 
 * ext4_ext_more_to_rm:

 * returns 1 if current index has to be freed (even partial)

 */

static int inline

static int

ext4_ext_more_to_rm(struct ext4_ext_path *path)

{

	BUG_ON(path->p_idx == NULL);