[PATCH] zram: clean up valid_io_request

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Shawn Lin <shawn.lin@rock-chips.com>
Newsgroups	linux.kernel
Subject	[PATCH] zram: clean up valid_io_request
Date	Thu, 18 Aug 2016 05:20:02 +0200
Message-ID	<s7m26-2f3-5@gated-at.bofh.it> (permalink)
X-263anti-Spam	KSV:0;
X-Mail-Gray	1
X-Abs-Checked	4
X-Rl-Sender	shawn.lin@rock-chips.com
X-Fst-To	minchan@kernel.org
X-Sender-IP	58.22.7.114
X-Login-Name	shawn.lin@rock-chips.com
X-Unique-Tag	<11cebb2f8bd7cd12ed74f8de1ba10262>
X-Sender	lintao@rock-chips.com
X-Mailer	git-send-email 1.8.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	36
Organization	linux.* mail to news gateway
X-Original-Cc	Nitin Gupta <ngupta@vflare.org>, Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Shawn Lin <shawn.lin@rock-chips.com>
X-Original-Date	Thu, 18 Aug 2016 11:08:01 +0800
X-Original-Message-ID	<1471489681-4027-1-git-send-email-shawn.lin@rock-chips.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1464906

Show key headers only | View raw

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 <shawn.lin@rock-chips.com>
---

 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] zram: clean up valid_io_request Shawn Lin <shawn.lin@rock-chips.com> - 2016-08-18 05:20 +0200
  Re: [PATCH] zram: clean up valid_io_request Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-08-18 05:30 +0200

csiph-web