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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E8B6C77B7C for ; Fri, 26 May 2023 07:34:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23307900004; Fri, 26 May 2023 03:33:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9C31900006; Fri, 26 May 2023 03:33:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACE78280002; Fri, 26 May 2023 03:33:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5BC56280001 for ; Fri, 26 May 2023 03:33:49 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3AB5A140E0C for ; Fri, 26 May 2023 07:33:49 +0000 (UTC) X-FDA: 80831591778.11.EAD5803 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf16.hostedemail.com (Postfix) with ESMTP id D04F318000F for ; Fri, 26 May 2023 07:33:45 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=A0xPKQUo; spf=none (imf16.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685086427; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=l8SXSO/lmiFeJihMCTRRFm0o8Ak15fMAUhw4BXdB6WA=; b=7t1/aiEljr6SWKCiDE67PGpSVxE5afW+U4QZ8odIeZncpgJj34Ha35Z3iCO8eKcwuZvYWk i20qb9eOW8dOlUkYGeYH8H9cPXiNaJ4zr2/82xgmVpbSevmRdHt5V955Go3Ai5/Ez+n0Oa VsFO4llLWqyGnnJMkALt9GSEe+GMk1o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685086427; a=rsa-sha256; cv=none; b=7kcqogEa7+Ev0fysS3tFDv8mU3lfwqEcksIB1MI6My3rgOodtTVKoB+4JJ19+xecqNe/8E 1WCfGqBwCRrI6vFym1qSZCKJ/jh8we8Z4Mf9r7L1UssQhKSvElVCoO1OOavTA2e9lAuMOg l3F04huuOnxRu6Sv9n7qZwgqg/9b25Y= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=A0xPKQUo; spf=none (imf16.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=l8SXSO/lmiFeJihMCTRRFm0o8Ak15fMAUhw4BXdB6WA=; b=A0xPKQUoDsDrFgURMQlgZXIoK4 lF0smhhvDr9DIwh3hI5+Foy4jSB44qqYKTW9k2PV/7PuWcBUSeOo6jWJLU2DNhMOCi1CTP1Vr1qXN cB1zrc2ldkTJb0i1ydOhaeGCJSHRsdi8p9dUGm95225TqZGlE84F6Y3mfrRFtVU8AAk/LeILUvTzj DCxobQiHgxGi8mvk1uiSyIKFvEMqMniMXjlXlxhbRRhvWQ3LnJ21MPhaTWeTq5Fi6r/fGfhBlXjzW o+5/0Ft/FRALeNM171FNjOPX7gizDDJyiLwYYmSgprAWBoMr6t5XCcMourkOlUq8zpJCEwA9TAgAY J55czzyw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1q2RxB-001Rda-0i; Fri, 26 May 2023 07:33:37 +0000 From: Luis Chamberlain To: axboe@kernel.dk, agk@redhat.com, snitzer@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, christoph.boehmwalder@linbit.com, hch@infradead.org, djwong@kernel.org, minchan@kernel.org, senozhatsky@chromium.org Cc: patches@lists.linux.dev, linux-block@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, dm-devel@redhat.com, drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, willy@infradead.org, hare@suse.de, p.raghav@samsung.com, da.gomez@samsung.com, rohan.puri@samsung.com, rpuri.linux@gmail.com, kbusch@kernel.org, mcgrof@kernel.org Subject: [PATCH v2 5/5] zram: use generic PAGE_SECTORS and PAGE_SECTORS_SHIFT Date: Fri, 26 May 2023 00:33:36 -0700 Message-Id: <20230526073336.344543-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230526073336.344543-1-mcgrof@kernel.org> References: <20230526073336.344543-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: mp1x1aj3i6pt9ty75skgssp7dknue38q X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: D04F318000F X-Rspam-User: X-HE-Tag: 1685086425-39706 X-HE-Meta: U2FsdGVkX19HGGXXz/ackLqU8DOlHqdEP2F+8E5EAmpeKHhKtQaPISVGtYMsbQ4oKAcpjGRh6kgZIYyIN6dTEV6iU/uGNiMW86VATxEWmNL8rPK+YX00EwvX1IW9vHhpEOTOU/aO8q9HsBLvLQhitSdLfmJnjaLiLVae0+6AvitxG9ZaxceeIVhyCQlwfjBYIB1tbExAjb6r+0P2ZJQS/dIboJdwj9n1+onYLrI0rSEhUHeDLCfo/gCb4dz+GMdgjHSVudwb647v9X1nzh1zTLkP1Ty/zGj1AIhzyazy1KEUErbNCseN4s3s4qokzZreE+ZmIiJEO94Ly+yza8YkGnZ8uTeLklob4PsmyQhIyBx0B940izLigjxtqhUBLx6iJ6k2+0qIqinWoWeGkFBHKFDnZLTp6I3J0kHFWxrWpqxy/b1V2acpdsAwAcuPJ30RmOx45Qkr6e62/kUr3q2ILf0nHyfYnux/T+/cuzNrSMd/vo6TvvB8eDXE50L9lfvZp/RE8zY0D/1keaWCnygEpEvXv62oBHcTsoxn6tA09Ph01oCh2FEWXk3m2GgOj7vR4877NLrexQrlKNlbixMhT/yUDa9ljkMCNEpTCRzJn16A9Bkj+E1wtIUi/EnA34+bUUiGDuxUegQwxm5eJiDjL33C4n2V98aKNSgRTuMjqznfxtkknpZ2Sb8ankr2t2g7t5Flwc5DuMcIrEIlknaacjShBvXgBJiqbiGO7LTAxXzKYWVwGkta7j52aUkuQVe/DsRHPUjMsHmL2vf8bvjhRgOhHYgku3gJ0rY49JP1s7jTJRfv4pCeLlKNwInTwMhaj2JNHR8hzdZ86LO5b9FTMAQHwlRwvD5xFZd8gjuCEkoUwbiW7LYeBwsB3VvK/JPz0qk5ttbIJiJXeci9MyV21I/nd1huBooGXfdxZY8K6GEOanmOT8mDUjNzNqFHYN3JK68i0ZOFDOksI9XKkHU cmOhHCvg ZmrN3oKYt7w23vf77YKvHvrruPJvepI6SFJ5uI4s3HrnGiaVlPDSiuSQs41yHUzYYjcViWHuFWd0/Nv5ry9WKgJvPEL3d5nK7B92LXsBpw18VuejDJqAQEFE6RRPNmIvjxfR6PJQA/CXLlakfFZQM3qg2qxVg1E+wSszDRXBXCRStJZmZnTVZqfuA9oRV/LFAe3WTd+7FzGa+eCSh1hEHrf5QjqQG8Vw7IhyEgn/f1fbvd9uUQmq1HdSJGA4ZLcKvnQYdVm4QYb/9FPr7Pi1l7OCi9mq6Nucm7zIEI7ShQpjqv8pd6ik5m7G8mRoC6WsHjAc8rNY+nLZMZcOTvWAom+AcO09wNW7GVnN2yUnQ6e93Hcck6UUWVTCRGmJC25IX9gQCDWgYAJH3AlWDazsO8jNVZs9/MI3vmV1LjWiyp65fzcfwV2RBVVupSj0haGP3FoLRq1xJozMwzPpswMOJdVZSCp0ylC2Dq2xSkgPHVsegDgNawFazJZ5yFJJ0G5kifmOOWYQptl/dhGMQzmThuX7FiX4Nt73JIO3BRpWaQj4Rfa3ANiR2WftF83nJ9CmFBO48 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: Instead of re-defining the already existing constants use the provided ones: So replace: o SECTORS_PER_PAGE_SHIFT with PAGE_SECTORS_SHIFT o SECTORS_PER_PAGE with PAGE_SECTORS This produces no functional changes. Reviewed-by: Sergey Senozhatsky Signed-off-by: Luis Chamberlain --- drivers/block/zram/zram_drv.c | 12 ++++++------ drivers/block/zram/zram_drv.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index f6d90f1ba5cf..5fdeb78ace9a 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1834,8 +1834,8 @@ static ssize_t recompress_store(struct device *dev, static void zram_bio_discard(struct zram *zram, struct bio *bio) { size_t n = bio->bi_iter.bi_size; - u32 index = bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; - u32 offset = (bio->bi_iter.bi_sector & (SECTORS_PER_PAGE - 1)) << + u32 index = bio->bi_iter.bi_sector >> PAGE_SECTORS_SHIFT; + u32 offset = (bio->bi_iter.bi_sector & (PAGE_SECTORS - 1)) << SECTOR_SHIFT; /* @@ -1876,8 +1876,8 @@ static void zram_bio_read(struct zram *zram, struct bio *bio) start_time = bio_start_io_acct(bio); bio_for_each_segment(bv, bio, iter) { - u32 index = iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; - u32 offset = (iter.bi_sector & (SECTORS_PER_PAGE - 1)) << + u32 index = iter.bi_sector >> PAGE_SECTORS_SHIFT; + u32 offset = (iter.bi_sector & (PAGE_SECTORS - 1)) << SECTOR_SHIFT; if (zram_bvec_read(zram, &bv, index, offset, bio) < 0) { @@ -1903,8 +1903,8 @@ static void zram_bio_write(struct zram *zram, struct bio *bio) start_time = bio_start_io_acct(bio); bio_for_each_segment(bv, bio, iter) { - u32 index = iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; - u32 offset = (iter.bi_sector & (SECTORS_PER_PAGE - 1)) << + u32 index = iter.bi_sector >> PAGE_SECTORS_SHIFT; + u32 offset = (iter.bi_sector & (PAGE_SECTORS - 1)) << SECTOR_SHIFT; if (zram_bvec_write(zram, &bv, index, offset, bio) < 0) { diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index ca7a15bd4845..9f2543af5c76 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -21,8 +21,6 @@ #include "zcomp.h" -#define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define SECTORS_PER_PAGE (1 << SECTORS_PER_PAGE_SHIFT) #define ZRAM_LOGICAL_BLOCK_SHIFT 12 #define ZRAM_LOGICAL_BLOCK_SIZE (1 << ZRAM_LOGICAL_BLOCK_SHIFT) #define ZRAM_SECTOR_PER_LOGICAL_BLOCK \ -- 2.39.2