--- fs/ext4/extents.c

+++ fs/ext4/extents.c

@@ -1948,7 +1948,7 @@ ext4_ext_in_cache(struct inode *inode, e

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);

@@ -3302,7 +3302,7 @@ int ext4_ext_get_blocks(handle_t *handle

*/

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);