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=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 D1523C433DF for ; Fri, 21 Aug 2020 02:04:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B533520738 for ; Fri, 21 Aug 2020 02:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbgHUCEk (ORCPT ); Thu, 20 Aug 2020 22:04:40 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:10247 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726983AbgHUCEj (ORCPT ); Thu, 20 Aug 2020 22:04:39 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 7CF4D46E9A2671E94ED7; Fri, 21 Aug 2020 10:04:36 +0800 (CST) Received: from DESKTOP-C3MD9UG.china.huawei.com (10.174.177.253) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 21 Aug 2020 10:04:27 +0800 From: Zhen Lei To: Jens Axboe , Coly Li , Kent Overstreet , Alasdair Kergon , Mike Snitzer , dm-devel , linux-block , linux-kernel , linux-bcache CC: Zhen Lei Subject: [PATCH 1/1] block: move the PAGE_SECTORS definition into Date: Fri, 21 Aug 2020 10:03:45 +0800 Message-ID: <20200821020345.3358-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.174.177.253] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are too many PAGE_SECTORS definitions, and all of them are the same. It looks a bit of a mess. So why not move it into , to achieve a basic and unique definition. Signed-off-by: Zhen Lei --- drivers/block/brd.c | 1 - drivers/block/null_blk_main.c | 1 - drivers/md/bcache/util.h | 2 -- include/linux/blkdev.h | 5 +++-- include/linux/device-mapper.h | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 2723a70eb855936..24c4687694b9f49 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -26,7 +26,6 @@ #include #define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) /* * Each block ramdisk device has a radix_tree brd_pages of pages that stores diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 47a9dad880af2aa..0624a26b86453ce 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -12,7 +12,6 @@ #include "null_blk.h" #define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) #define SECTOR_MASK (PAGE_SECTORS - 1) #define FREE_BATCH 16 diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index c029f7443190805..55196e0f37c32c6 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h @@ -15,8 +15,6 @@ #include "closure.h" -#define PAGE_SECTORS (PAGE_SIZE / 512) - struct closure; #ifdef CONFIG_BCACHE_DEBUG diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index bb5636cc17b91a7..b068dfc5f2ef0ab 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -949,11 +949,12 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev) * multiple of 512 bytes. Hence these two constants. */ #ifndef SECTOR_SHIFT -#define SECTOR_SHIFT 9 +#define SECTOR_SHIFT 9 #endif #ifndef SECTOR_SIZE -#define SECTOR_SIZE (1 << SECTOR_SHIFT) +#define SECTOR_SIZE (1 << SECTOR_SHIFT) #endif +#define PAGE_SECTORS (PAGE_SIZE / SECTOR_SIZE) /* * blk_rq_pos() : the current sector diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 93096e524e43945..ffccce9b700c326 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -143,7 +143,6 @@ typedef size_t (*dm_dax_copy_iter_fn)(struct dm_target *ti, pgoff_t pgoff, void *addr, size_t bytes, struct iov_iter *i); typedef int (*dm_dax_zero_page_range_fn)(struct dm_target *ti, pgoff_t pgoff, size_t nr_pages); -#define PAGE_SECTORS (PAGE_SIZE / 512) void dm_error(const char *message); -- 1.8.3