From patchwork Thu May 7 07:50:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 11532729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60341913 for ; Thu, 7 May 2020 07:56:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 342C22080D for ; Thu, 7 May 2020 07:56:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 342C22080D 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 8A9CD900002; Thu, 7 May 2020 03:56:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8816C900006; Thu, 7 May 2020 03:56:03 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76FD2900002; Thu, 7 May 2020 03:56:03 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 4FD4B900006 for ; Thu, 7 May 2020 03:56:03 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0C7A4181AEF39 for ; Thu, 7 May 2020 07:56:03 +0000 (UTC) X-FDA: 76789164606.10.bread61_179d8b4ac7130 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,thunder.leizhen@huawei.com,,RULES_HIT:4705:30012:30034:30054,0,RBL:45.249.212.32:@huawei.com:.lbl8.mailshell.net-64.95.201.95 62.18.2.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: bread61_179d8b4ac7130 X-Filterd-Recvd-Size: 4103 Received: from huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Thu, 7 May 2020 07:56:02 +0000 (UTC) Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 67FFC5C86ABFCE12BA9B; Thu, 7 May 2020 15:55:53 +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:44 +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 00/10] clean up SECTOR related macros and sectors/pages conversions Date: Thu, 7 May 2020 15:50:50 +0800 Message-ID: <20200507075100.1779-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.166.215.55] X-CFilter-Loop: Reflected 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: v1 --> v2: As Matthew Wilcox's suggestion, add sectors_to_npage()/npage_to_sectors() helpers to eliminate SECTORS_PER_PAGE_SHIFT, because it's quite hard to read. In further, I also eliminated PAGE_SECTORS_SHIFT. I tried to eliminate all magic number "9" and "512", but it's too many, maybe no one want to review it, so I gave up. In the process of searching, I found the existing macro PAGE_SECTORS, it's equivalent to SECTORS_PER_PAGE. Because PAGE_SECTORS was defined in include/linux/device-mapper.h, and SECTORS_PER_PAGE was defined in drivers/block/zram/zram_drv.h, so I discarded SECTORS_PER_PAGE, althrough I prefer it so much. v1: When I studied the code of mm/swap, I found "1 << (PAGE_SHIFT - 9)" appears many times. So I try to clean up it. 1. Replace "1 << (PAGE_SHIFT - 9)" or similar with SECTORS_PER_PAGE 2. Replace "PAGE_SHIFT - 9" with SECTORS_PER_PAGE_SHIFT 3. Replace "9" with SECTOR_SHIFT 4. Replace "512" with SECTOR_SIZE Zhen Lei (10): block: move PAGE_SECTORS definition into zram: abolish macro SECTORS_PER_PAGE block: add sectors_to_npage()/npage_to_sectors() helpers zram: abolish macro SECTORS_PER_PAGE_SHIFT block: abolish macro PAGE_SECTORS_SHIFT mm/swap: use npage_to_sectors() and PAGE_SECTORS to clean up code block: use sectors_to_npage() and PAGE_SECTORS to clean up code md: use sectors_to_npage() and npage_to_sectors() to clean up code md: use existing definition RESYNC_SECTORS md: use PAGE_SECTORS to clean up code block/blk-settings.c | 6 +++--- block/partitions/core.c | 5 ++--- drivers/block/brd.c | 7 ++----- drivers/block/null_blk_main.c | 10 ++++------ drivers/block/zram/zram_drv.c | 8 ++++---- drivers/block/zram/zram_drv.h | 2 -- drivers/md/bcache/util.h | 2 -- drivers/md/dm-kcopyd.c | 2 +- drivers/md/dm-table.c | 2 +- drivers/md/md-bitmap.c | 16 ++++++++-------- drivers/md/md.c | 6 +++--- drivers/md/raid1.c | 10 +++++----- drivers/md/raid10.c | 28 ++++++++++++++-------------- drivers/md/raid5-cache.c | 11 +++++------ drivers/md/raid5.c | 4 ++-- include/linux/blkdev.h | 7 +++++-- include/linux/device-mapper.h | 1 - mm/page_io.c | 4 ++-- mm/swapfile.c | 12 ++++++------ 19 files changed, 67 insertions(+), 76 deletions(-)