From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE315C47257 for ; Thu, 7 May 2020 07:56:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F54C2080D for ; Thu, 7 May 2020 07:56:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F54C2080D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 24251900006; Thu, 7 May 2020 03:56:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 218AC900009; Thu, 7 May 2020 03:56:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15B28900006; Thu, 7 May 2020 03:56:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0166.hostedemail.com [216.40.44.166]) by kanga.kvack.org (Postfix) with ESMTP id E4EC4900009 for ; Thu, 7 May 2020 03:56:04 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A8125124F for ; Thu, 7 May 2020 07:56:04 +0000 (UTC) X-FDA: 76789164648.18.wheel50_17e35a4595e37 X-HE-Tag: wheel50_17e35a4595e37 X-Filterd-Recvd-Size: 3389 Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Thu, 7 May 2020 07:56:03 +0000 (UTC) Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 6EC65A859BAE067234FF; Thu, 7 May 2020 15:55:58 +0800 (CST) Received: from DESKTOP-C3MD9UG.china.huawei.com (10.166.215.55) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Thu, 7 May 2020 15:55:47 +0800 From: Zhen Lei To: Minchan Kim , Nitin Gupta , "Sergey Senozhatsky" , Matthew Wilcox , Jens Axboe , Coly Li , Kent Overstreet , "Alasdair Kergon" , Mike Snitzer , linux-block , Andrew Morton , linux-mm , dm-devel , Song Liu , linux-raid , linux-kernel CC: Zhen Lei Subject: [PATCH v2 04/10] zram: abolish macro SECTORS_PER_PAGE_SHIFT Date: Thu, 7 May 2020 15:50:54 +0800 Message-ID: <20200507075100.1779-5-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20200507075100.1779-1-thunder.leizhen@huawei.com> References: <20200507075100.1779-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.166.215.55] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The name of SECTORS_PER_PAGE_SHIFT is quite hard to read. So use sectors_to_npage() to replace ">> SECTORS_PER_PAGE_SHIFT" Suggested-by: Matthew Wilcox Signed-off-by: Zhen Lei --- drivers/block/zram/zram_drv.c | 4 ++-- drivers/block/zram/zram_drv.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.= c index e2fbf7a847e7..918b77f9bce4 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1549,7 +1549,7 @@ static void __zram_make_request(struct zram *zram, = struct bio *bio) struct bio_vec bvec; struct bvec_iter iter; =20 - index =3D bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; + index =3D sectors_to_npage(bio->bi_iter.bi_sector); offset =3D (bio->bi_iter.bi_sector & (PAGE_SECTORS - 1)) << SECTOR_SHIFT; =20 @@ -1644,7 +1644,7 @@ static int zram_rw_page(struct block_device *bdev, = sector_t sector, goto out; } =20 - index =3D sector >> SECTORS_PER_PAGE_SHIFT; + index =3D sectors_to_npage(sector); offset =3D (sector & (PAGE_SECTORS - 1)) << SECTOR_SHIFT; =20 bv.bv_page =3D page; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.= h index 10fdf413dd6e..12309175d55e 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -21,7 +21,6 @@ =20 #include "zcomp.h" =20 -#define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) #define ZRAM_LOGICAL_BLOCK_SHIFT 12 #define ZRAM_LOGICAL_BLOCK_SIZE (1 << ZRAM_LOGICAL_BLOCK_SHIFT) #define ZRAM_SECTOR_PER_LOGICAL_BLOCK \ --=20 2.26.0.106.g9fadedd