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

Commit 731eb1a0 authored by Akinobu Mita's avatar Akinobu Mita Committed by Theodore Ts'o
Browse files

ext4: consolidate in_range() definitions 



There are duplicate macro definitions of in_range() in mballoc.h and
balloc.c.  This consolidates these two definitions into ext4.h, and
changes extents.c to use in_range() as well.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: Andreas Dilger <adilger@sun.com>
parent bda00de7

fs/ext4/balloc.c

+0 −3
Original line number Diff line number Diff line
@@ -188,9 +188,6 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
 * when a file system is mounted (see ext4_fill_super).

 */





#define in_range(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)



/**

 * ext4_get_group_desc() -- load group descriptor from disk

 * @sb:			super block

fs/ext4/ext4.h

+2 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,8 @@ static inline void set_bitmap_uptodate(struct buffer_head *bh) 
	set_bit(BH_BITMAP_UPTODATE, &(bh)->b_state);

}



#define in_range(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)



#endif	/* __KERNEL__ */



#endif	/* _EXT4_H */

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -2051,7 +2051,7 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block, 


	BUG_ON(cex->ec_type != EXT4_EXT_CACHE_GAP &&

			cex->ec_type != EXT4_EXT_CACHE_EXTENT);

	if (block >= cex->ec_block && block < cex->ec_block + cex->ec_len) {

	if (in_range(block, cex->ec_block, cex->ec_len)) {

		ex->ee_block = cpu_to_le32(cex->ec_block);

		ext4_ext_store_pblock(ex, cex->ec_start);

		ex->ee_len = cpu_to_le16(cex->ec_len);
@@ -3364,7 +3364,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, 
		 */

		ee_len = ext4_ext_get_actual_len(ex);

		/* if found extent covers block, simply return it */

		if (iblock >= ee_block && iblock < ee_block + ee_len) {

		if (in_range(iblock, ee_block, ee_len)) {

			newblock = iblock - ee_block + ee_start;

			/* number of remaining blocks in the extent */

			allocated = ee_len - (iblock - ee_block);

fs/ext4/mballoc.h

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ struct ext4_buddy { 
#define EXT4_MB_BITMAP(e4b)	((e4b)->bd_bitmap)

#define EXT4_MB_BUDDY(e4b)	((e4b)->bd_buddy)



#define in_range(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)



static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb,

					struct ext4_free_extent *fex)

{