Use IS_ALIGNED instead of opencoding to check the unaligned case. And size is aligned to ZRAM_LOGICAL_BLOCK_SIZE which will not make end <= start, so we do not need to compare the start and end.
Signed-off-by: Shawn Lin <[email protected]> --- drivers/block/zram/zram_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 04365b1..1094e95 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -120,15 +120,15 @@ static inline bool valid_io_request(struct zram *zram, u64 end, bound; /* unaligned request */ - if (unlikely(start & (ZRAM_SECTOR_PER_LOGICAL_BLOCK - 1))) + if (unlikely(!IS_ALIGNED(start, ZRAM_SECTOR_PER_LOGICAL_BLOCK))) return false; - if (unlikely(size & (ZRAM_LOGICAL_BLOCK_SIZE - 1))) + if (unlikely(!IS_ALIGNED(size, ZRAM_LOGICAL_BLOCK_SIZE))) return false; end = start + (size >> SECTOR_SHIFT); bound = zram->disksize >> SECTOR_SHIFT; /* out of range range */ - if (unlikely(start >= bound || end > bound || start > end)) + if (unlikely(start >= bound || end > bound)) return false; /* I/O request is valid */ -- 2.3.7
