From patchwork Fri Apr 21 19:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13220636 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 07E7DC77B7F for ; Fri, 21 Apr 2023 19:58:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E5BF6B0080; Fri, 21 Apr 2023 15:58:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F34656B007E; Fri, 21 Apr 2023 15:58:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9E9B6B007B; Fri, 21 Apr 2023 15:58:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4E3226B0078 for ; Fri, 21 Apr 2023 15:58:22 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 13F761A02AF for ; Fri, 21 Apr 2023 19:58:22 +0000 (UTC) X-FDA: 80706460044.19.12831E6 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf17.hostedemail.com (Postfix) with ESMTP id 71F5140018 for ; Fri, 21 Apr 2023 19:58:19 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ngzYAuBK; spf=none (imf17.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=1682107099; 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=YNaeywPG0hf9vLC0oGzgXUzMq14M1rf2z1Pu3jCjc18=; b=IV3KQcncddbehHwfXezs5WFEeM5Ac48AQTK2ro07LlOH/RqLP9/XsJUrzsZBJ57EB2JSvW FprWmj4JqvUSWJpNduhfcWIHAMNeLgBFQ0bV6wByqxVF9rtqnoc++FJIn2a4ArJGnSBJ1V kc4+6xEQvjGfD0PJXJplE7j8SryEsxM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ngzYAuBK; spf=none (imf17.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682107099; a=rsa-sha256; cv=none; b=1g8CnJJrZs9wj1qyjp+oO6/gN5malpJi9bfmkcWPFFs6UKqBsH134TyLsZIvgSbPJg4JCI 16JiuzLRrHDarQ3/zF2vKM1PRPRWvYciY5NvzGNGOMZ+KQSVkO8vJKKJn2aXZi85tkV4ZR cl6Y8q94HoPJ0MCepsLWqWjfLDp1Gfg= 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=YNaeywPG0hf9vLC0oGzgXUzMq14M1rf2z1Pu3jCjc18=; b=ngzYAuBKDLAoLCg9a3fSYyxaF7 Psmp6RNidLp/Hoz9Sz3Yaw4hJW6ICtW0d4gYHRtDbEVmUURusmziBCiUS8bTLXRjIGpepiBVYvy4V AwpjQ3WoHeBlc3DLTnq8Mlk6ISbisM8Dq/dyJwP58qth31M8tqk7cOBV5m4mcx0Eb3/Yq37hx40Q1 sTKkHJsz0qslYzsxgNwgcjkPJnjnr4qcRujKf1sQeDcoSvwEN+/9SSuTrxHTTWDLBYGm0TSLjdm/O l/CPxIM1wE772UFBPe1DRj82PuNz0beeob2viWswsRu9DrjB2lpvHI+yRXpn9Gc4ldGRFkXpKwslh E2nlol0A==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1ppwtU-00BlaZ-1j; Fri, 21 Apr 2023 19:58:08 +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, kbusch@kernel.org, mcgrof@kernel.org Subject: [PATCH 2/5] drbd: use PAGE_SECTORS_SHIFT and PAGE_SECTORS Date: Fri, 21 Apr 2023 12:58:04 -0700 Message-Id: <20230421195807.2804512-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230421195807.2804512-1-mcgrof@kernel.org> References: <20230421195807.2804512-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: zrpmon5k9kp67qpp1ngtx3tmsndb9imi X-Rspamd-Queue-Id: 71F5140018 X-HE-Tag: 1682107099-776099 X-HE-Meta: U2FsdGVkX1+ChppXusbDgE37l16U9BQeTBzlE8UnDyVtPlr23qQ2HZo3ewryZe0Gnu7ft/K2kDts0GJxXx4XbsXue8Km63J+gZDgMTr7cTlRbwCyL913DzoKfHaqUmlHK9SDGAsymE5HmV1fpJPRjS0vUDK+H34Ny4vKWDKxym7D/IaApl9tK7LJBBAJ/acHWPdlHvcmkghlM1lFU4I7XaOtbEFz3J6JfVCuSxbOke9yUoPSM0sY4Mc45fVERho8E4PMjgX/YHmPPyGKPP5QLeW9BEvil/9RirHTu0pIQX7sNvSEDHudstkxh6En1uK18/3kE+GQ+5bpUmmxB9HyKFCLzdRM6Fk4+QvyeenuWhv3OvL4Rw2MUVRNeX5eoq8F5jCmZAzFBdxnlGq/PgWBGMQFZOUAHWMv7TfieE5kk+Gj+4yYnWdwFU8NgZhSIHysangVYb7IBrxh7mxLfMJI3tv5UhaZmeChIdi+4wlkLh6OMqxFEKuA1AFlktwuNYKWw1TdRzVPFl/31o7irn2rRnoH3KqxL3TsSGGj0Nivp5O8jaGD5HxAcqiFb+AJLB5JhSyaw2nCE3C0xt7XU390upioXggoPQmwiIoXhqA3z375MyAcFu6FuWKbDcPVmxIJd4Q4DumA4+jo15XPJn0n6o5GKNTb7wRMg00ocyV9kZTtO54g67eIQu25nXAgx/E1ltxcbWKFGmVypek71Sl/c0Qleh8frLrlpk5uOSDeLc2+acK3J6VT3rtM/6ySti2bwRjPkvG9wI9df+RIX/+FW//pq/E5MpvN7fccr+gbshzP+p3ywaqSiuHyM+BR6v7scgPIKDAHQ6Qj3ztGDDP5KGRfvcGE389ybGHExxt+7WkcO1hbllPPPITJLKIwco5BNsrEaTwUSwltKICEAYEW2HvJZ2htmfZfa/LLoEEDRizbBwbLihJrlQUbXHkyF57ttRX2t2enT3FNQIlnBtZ hOK9qcxv n2PMkuIGAmhOlfuBmtOGPR/J243jus5Y53CH4WrHRluk8qSg1zrTYgakB2Rf3qKMbkeBVz9IRbuoNJV8iodrzXk1vyrAqufAxSwxjaFNwUiRyzOpcuMN/2X69nC7jIBDSKeL4L3W3S5y3djnfag4LmYsbq2jVuhxYRFdc7bMk8iDGXECdi8KFi1weH5LOzetNjwjzVRzWrfsD54gFM1WphYsuMV5YR4rVRC40n9gz4IgZA2Gy6dfvbskuNL8VnXt8/hOzF5cPTlYkrcIMD5JvCGVNrQ9hMmCGRajmwCo2bQig8u06B9V0ed2qEkK5S0v+NWzIRRZwsM0+w53WZRCoI0PcwCXdZ40OgfdJQ320yaXfmpUkusiCvTRPT63CNLXnIqiOZG6B1l5ZDkFsNLGyGDlF8N5kl8p1qbYqGB+UT//ZL7HORS67Pjk7uzP12fbzm9hz 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: Replace common constants with generic versions. This produces no functional changes. Signed-off-by: Luis Chamberlain Acked-by: Christoph Böhmwalder --- drivers/block/drbd/drbd_bitmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 6ac8c54b44c7..b556e6634f13 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -1000,7 +1000,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho unsigned int len; first_bm_sect = device->ldev->md.md_offset + device->ldev->md.bm_offset; - on_disk_sector = first_bm_sect + (((sector_t)page_nr) << (PAGE_SHIFT-SECTOR_SHIFT)); + on_disk_sector = first_bm_sect + (((sector_t)page_nr) << PAGE_SECTORS_SHIFT); /* this might happen with very small * flexible external meta data device, @@ -1008,7 +1008,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho last_bm_sect = drbd_md_last_bitmap_sector(device->ldev); if (first_bm_sect <= on_disk_sector && last_bm_sect >= on_disk_sector) { sector_t len_sect = last_bm_sect - on_disk_sector + 1; - if (len_sect < PAGE_SIZE/SECTOR_SIZE) + if (len_sect < PAGE_SECTORS) len = (unsigned int)len_sect*SECTOR_SIZE; else len = PAGE_SIZE;