From nobody Mon May 6 21:22:00 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583879777; cv=none; d=zohomail.com; s=zohoarc; b=ZP8A6suy3bDsXsKvnELsvvmn0evJj5+WkUzhRRN7tiUkNYC039tl6Cgk7KWTtlmPVlGPLbnhRP/IT5bLgRmgi7ex8PN3AItlpNIik0MRlJGnNV9A9a6e45CEdYu3haewp3bxf/N4KDoMLta/i/0yki/ZG3Dw+JqDgITBx5r5Eyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583879777; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=4heJt1bxstF6UNVav5X2DWwC95vC3hR18clXGNYWyck=; b=NqhnG7ar19T2RrgmqNYEWP9Jn92CYSpuRL6nHB9HUXw00NVpmOqqqh1E26E+xMTTj9vuVs+MQ8ZjEHD/GTs1d2tDBt3/yuaUr+NZqd9M3zstRWNb0YZjpsQGvZ9SMorbbtoFhJKoUabhBV7K402e+dShVgM6w390bv3eFBocLVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1583879777147779.0712322445775; Tue, 10 Mar 2020 15:36:17 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBnTJ-0000YR-HV; Tue, 10 Mar 2020 22:35:33 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBnTI-0000YK-C5 for xen-devel@lists.xenproject.org; Tue, 10 Mar 2020 22:35:32 +0000 Received: from us-smtp-1.mimecast.com (unknown [207.211.31.120]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 72e4b9a8-631f-11ea-92cf-bc764e2007e4; Tue, 10 Mar 2020 22:35:31 +0000 (UTC) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-Iym77T3qPd-RTahwsr31lA-1; Tue, 10 Mar 2020 18:35:26 -0400 Received: by mail-wr1-f69.google.com with SMTP id x14so7379525wrv.23 for ; Tue, 10 Mar 2020 15:35:26 -0700 (PDT) Received: from raver.teknoraver.net (net-93-144-9-178.cust.vodafonedsl.it. [93.144.9.178]) by smtp.gmail.com with ESMTPSA id k133sm6029548wma.11.2020.03.10.15.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 15:35:24 -0700 (PDT) X-Inumbo-ID: 72e4b9a8-631f-11ea-92cf-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583879730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nxnV7e8Y/4EoK+UUY0IMGfHMZqci6w/MqMwbbZF4aw=; b=i+qaBeRJQg9Ve7rUHbSk4AQ/onQZY7UgpYk/BrdyL5WcvIuVvqZOHuqV6kmdbEFXzdvIlS +zYzeHoT3yD5znLKfAAGje/UxT2fIyU+9GU1DYpJZXeuD2OaMuDMSgRnvUUMs7uLs8FQm6 mm11tOg0MMsJRK1coYoQ3BnzHM7KCZI= X-MC-Unique: Iym77T3qPd-RTahwsr31lA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+eyiaZTyQIcQ/KNzYAXeKGfkFej/IHvp5P/4xpsQi4g=; b=hk29rfeiQkd+fzpwMWpqXJRjSWArzgj/9LFD0fwAqeIcCOrtPiqcAMQdPpBl/6LnOH RHy5WTYkv9wYyjXl5/NYS1C0/1GUYMEUfs1dADER7X48R85Je/VBRBUUTMJAATipAr09 DZFHCEqIpiHpK/VDIOk1beGLLqTZNuBRN4ANjkmJUaWxufd9wT1O2oU37cwdRcDvDHgl Dz8tIRy9nKHM9wyuGsvYOxD0J92StPW2dOA7YvUmVmg1Xy6VH1q+M6fgeVUB4gaVFrpI lO4iGE+0isUHJqSyzGZhNxx+F8K2ck2hkIygu8sq1T2OdC3HzFYm7eARh2k82En+ZtnZ xV9w== X-Gm-Message-State: ANhLgQ02LUOU3abKR5wCsk9mzLd+EeHlq3nVcSeyyhLFLl5aofWZjC6p BngmcSmGi2L01ljtMq/chs8CENsTYnjcBLxn3XA75t4OgS2rFvrochDJoW02SZmHFz/462nCPJT wx8JsgAknBL3NcIH4zxPII5LZcK0= X-Received: by 2002:a7b:ce0d:: with SMTP id m13mr4038681wmc.135.1583879725387; Tue, 10 Mar 2020 15:35:25 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu8tA8wuEvPHHQ5TUxwPNFy5Jjp28qjGxduDuBBBLqHAWSLKUgeXurgzudExdP3uioTitEPoA== X-Received: by 2002:a7b:ce0d:: with SMTP id m13mr4038648wmc.135.1583879724854; Tue, 10 Mar 2020 15:35:24 -0700 (PDT) From: Matteo Croce To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org, xen-devel@lists.xenproject.org, linux-scsi@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 10 Mar 2020 23:35:16 +0100 Message-Id: <20200310223516.102758-1-mcroce@redhat.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v2] block: refactor duplicated macros X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Jens Axboe , Ulf Hansson , "James E.J. Bottomley" , Song Liu , Dan Williams , Anna Schumaker Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The macros PAGE_SECTORS, PAGE_SECTORS_SHIFT and SECTOR_MASK are defined several times in different flavours across the whole tree. Define them just once in a common header. Signed-off-by: Matteo Croce --- v2: As Dan Williams suggested: #define PAGE_SECTORS_MASK (~(PAGE_SECTORS - 1)) block/blk-lib.c | 2 +- drivers/block/brd.c | 3 --- drivers/block/null_blk_main.c | 14 +++++--------- drivers/block/zram/zram_drv.c | 8 ++++---- drivers/block/zram/zram_drv.h | 2 -- drivers/dax/super.c | 2 +- drivers/md/bcache/util.h | 2 -- drivers/md/dm-bufio.c | 6 +++--- drivers/md/dm-integrity.c | 10 +++++----- drivers/md/md.c | 4 ++-- drivers/md/raid1.c | 2 +- drivers/mmc/core/host.c | 3 ++- drivers/scsi/xen-scsifront.c | 4 ++-- fs/iomap/buffered-io.c | 2 +- fs/nfs/blocklayout/blocklayout.h | 2 -- include/linux/blkdev.h | 4 ++++ include/linux/device-mapper.h | 1 - 17 files changed, 31 insertions(+), 40 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 5f2c429d4378..f5e705d307e0 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -260,7 +260,7 @@ static int __blkdev_issue_write_zeroes(struct block_dev= ice *bdev, */ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects) { - sector_t pages =3D DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SIZE / 512); + sector_t pages =3D DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SECTORS); =20 return min(pages, (sector_t)BIO_MAX_PAGES); } diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 220c5e18aba0..33e2cbe11400 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -25,9 +25,6 @@ =20 #include =20 -#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 stor= es * the pages containing the block device's contents. A brd page's ->index = is diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 16510795e377..b5ebde97bf0b 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -11,10 +11,6 @@ #include #include "null_blk.h" =20 -#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 =20 #define TICKS_PER_SEC 50ULL @@ -721,7 +717,7 @@ static void null_free_sector(struct nullb *nullb, secto= r_t sector, =20 root =3D is_cache ? &nullb->dev->cache : &nullb->dev->data; idx =3D sector >> PAGE_SECTORS_SHIFT; - sector_bit =3D (sector & SECTOR_MASK); + sector_bit =3D (sector & PAGE_SECTORS_MASK); =20 t_page =3D radix_tree_lookup(root, idx); if (t_page) { @@ -792,7 +788,7 @@ static struct nullb_page *__null_lookup_page(struct nul= lb *nullb, struct radix_tree_root *root; =20 idx =3D sector >> PAGE_SECTORS_SHIFT; - sector_bit =3D (sector & SECTOR_MASK); + sector_bit =3D (sector & PAGE_SECTORS_MASK); =20 root =3D is_cache ? &nullb->dev->cache : &nullb->dev->data; t_page =3D radix_tree_lookup(root, idx); @@ -967,7 +963,7 @@ static int copy_to_nullb(struct nullb *nullb, struct pa= ge *source, if (null_cache_active(nullb) && !is_fua) null_make_cache_space(nullb, PAGE_SIZE); =20 - offset =3D (sector & SECTOR_MASK) << SECTOR_SHIFT; + offset =3D (sector & PAGE_SECTORS_MASK) << SECTOR_SHIFT; t_page =3D null_insert_page(nullb, sector, !null_cache_active(nullb) || is_fua); if (!t_page) @@ -979,7 +975,7 @@ static int copy_to_nullb(struct nullb *nullb, struct pa= ge *source, kunmap_atomic(dst); kunmap_atomic(src); =20 - __set_bit(sector & SECTOR_MASK, t_page->bitmap); + __set_bit(sector & PAGE_SECTORS_MASK, t_page->bitmap); =20 if (is_fua) null_free_sector(nullb, sector, true); @@ -1001,7 +997,7 @@ static int copy_from_nullb(struct nullb *nullb, struct= page *dest, while (count < n) { temp =3D min_t(size_t, nullb->dev->blocksize, n - count); =20 - offset =3D (sector & SECTOR_MASK) << SECTOR_SHIFT; + offset =3D (sector & PAGE_SECTORS_MASK) << SECTOR_SHIFT; t_page =3D null_lookup_page(nullb, sector, false, !null_cache_active(nullb)); =20 diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 1bdb5793842b..725bd33f302d 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1548,9 +1548,9 @@ static void __zram_make_request(struct zram *zram, st= ruct bio *bio) struct bio_vec bvec; struct bvec_iter iter; =20 - index =3D bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; + index =3D bio->bi_iter.bi_sector >> PAGE_SECTORS_SHIFT; offset =3D (bio->bi_iter.bi_sector & - (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT; + PAGE_SECTORS_MASK) << SECTOR_SHIFT; =20 switch (bio_op(bio)) { case REQ_OP_DISCARD: @@ -1643,8 +1643,8 @@ static int zram_rw_page(struct block_device *bdev, se= ctor_t sector, goto out; } =20 - index =3D sector >> SECTORS_PER_PAGE_SHIFT; - offset =3D (sector & (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT; + index =3D sector >> PAGE_SECTORS_SHIFT; + offset =3D (sector & PAGE_SECTORS_MASK) << SECTOR_SHIFT; =20 bv.bv_page =3D page; bv.bv_len =3D PAGE_SIZE; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index f2fd46daa760..12309175d55e 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -21,8 +21,6 @@ =20 #include "zcomp.h" =20 -#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 \ diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 0aa4b6bc5101..7f7672f72085 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -92,7 +92,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, return false; } =20 - last_page =3D PFN_DOWN((start + sectors - 1) * 512) * PAGE_SIZE / 512; + last_page =3D PFN_DOWN((start + sectors - 1) * 512) * PAGE_SECTORS; err =3D bdev_dax_pgoff(bdev, last_page, PAGE_SIZE, &pgoff_end); if (err) { pr_debug("%s: error: unaligned partition for dax\n", diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index c029f7443190..55196e0f37c3 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h @@ -15,8 +15,6 @@ =20 #include "closure.h" =20 -#define PAGE_SECTORS (PAGE_SIZE / 512) - struct closure; =20 #ifdef CONFIG_BCACHE_DEBUG diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 2d519c223562..f4496ce0d598 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -384,7 +384,7 @@ static void *alloc_buffer_data(struct dm_bufio_client *= c, gfp_t gfp_mask, gfp_mask & __GFP_NORETRY) { *data_mode =3D DATA_MODE_GET_FREE_PAGES; return (void *)__get_free_pages(gfp_mask, - c->sectors_per_block_bits - (PAGE_SHIFT - SECTOR_SHIFT)); + c->sectors_per_block_bits - PAGE_SECTORS_SHIFT); } =20 *data_mode =3D DATA_MODE_VMALLOC; @@ -422,7 +422,7 @@ static void free_buffer_data(struct dm_bufio_client *c, =20 case DATA_MODE_GET_FREE_PAGES: free_pages((unsigned long)data, - c->sectors_per_block_bits - (PAGE_SHIFT - SECTOR_SHIFT)); + c->sectors_per_block_bits - PAGE_SECTORS_SHIFT); break; =20 case DATA_MODE_VMALLOC: @@ -597,7 +597,7 @@ static void use_bio(struct dm_buffer *b, int rw, sector= _t sector, unsigned vec_size, len; =20 vec_size =3D b->c->block_size >> PAGE_SHIFT; - if (unlikely(b->c->sectors_per_block_bits < PAGE_SHIFT - SECTOR_SHIFT)) + if (unlikely(b->c->sectors_per_block_bits < PAGE_SECTORS_SHIFT)) vec_size +=3D 2; =20 bio =3D bio_kmalloc(GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN, vec_size); diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index b225b3e445fa..4e60cda465cc 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -652,7 +652,7 @@ static void page_list_location(struct dm_integrity_c *i= c, unsigned section, unsi =20 sector =3D section * ic->journal_section_sectors + offset; =20 - *pl_index =3D sector >> (PAGE_SHIFT - SECTOR_SHIFT); + *pl_index =3D sector >> PAGE_SECTORS_SHIFT; *pl_offset =3D (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1); } =20 @@ -951,7 +951,7 @@ static void rw_journal_sectors(struct dm_integrity_c *i= c, int op, int op_flags, return; } =20 - pl_index =3D sector >> (PAGE_SHIFT - SECTOR_SHIFT); + pl_index =3D sector >> PAGE_SECTORS_SHIFT; pl_offset =3D (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1); =20 io_req.bi_op =3D op; @@ -1072,7 +1072,7 @@ static void copy_from_journal(struct dm_integrity_c *= ic, unsigned section, unsig =20 sector =3D section * ic->journal_section_sectors + JOURNAL_BLOCK_SECTORS = + offset; =20 - pl_index =3D sector >> (PAGE_SHIFT - SECTOR_SHIFT); + pl_index =3D sector >> PAGE_SECTORS_SHIFT; pl_offset =3D (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1); =20 io_req.bi_op =3D REQ_OP_WRITE; @@ -3343,7 +3343,7 @@ static int create_journal(struct dm_integrity_c *ic, = char **error) ic->commit_ids[3] =3D cpu_to_le64(0x4444444444444444ULL); =20 journal_pages =3D roundup((__u64)ic->journal_sections * ic->journal_secti= on_sectors, - PAGE_SIZE >> SECTOR_SHIFT) >> (PAGE_SHIFT - SECTOR_SHIFT); + PAGE_SIZE >> SECTOR_SHIFT) >> PAGE_SECTORS_SHIFT; journal_desc_size =3D journal_pages * sizeof(struct page_list); if (journal_pages >=3D totalram_pages() - totalhigh_pages() || journal_de= sc_size > ULONG_MAX) { *error =3D "Journal doesn't fit into memory"; @@ -4075,7 +4075,7 @@ static int dm_integrity_ctr(struct dm_target *ti, uns= igned argc, char **argv) spin_lock_init(&bbs->bio_queue_lock); =20 sector =3D i * (BITMAP_BLOCK_SIZE >> SECTOR_SHIFT); - pl_index =3D sector >> (PAGE_SHIFT - SECTOR_SHIFT); + pl_index =3D sector >> PAGE_SECTORS_SHIFT; pl_offset =3D (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1); =20 bbs->bitmap =3D lowmem_page_address(ic->journal[pl_index].page) + pl_of= fset; diff --git a/drivers/md/md.c b/drivers/md/md.c index 469f551863be..b28f9390608f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1734,7 +1734,7 @@ static int super_1_load(struct md_rdev *rdev, struct = md_rdev *refdev, int minor_ __le64 *bbp; int i; int sectors =3D le16_to_cpu(sb->bblog_size); - if (sectors > (PAGE_SIZE / 512)) + if (sectors > PAGE_SECTORS) return -EINVAL; offset =3D le32_to_cpu(sb->bblog_offset); if (offset =3D=3D 0) @@ -8733,7 +8733,7 @@ void md_do_sync(struct md_thread *thread) /* * Tune reconstruction: */ - window =3D 32 * (PAGE_SIZE / 512); + window =3D 32 * PAGE_SECTORS; pr_debug("md: using %dk window, over a total of %lluk.\n", window/2, (unsigned long long)max_sectors/2); =20 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index cd810e195086..37a0b571903a 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2129,7 +2129,7 @@ static void process_checks(struct r1bio *r1_bio) int vcnt; =20 /* Fix variable parts of all bios */ - vcnt =3D (r1_bio->sectors + PAGE_SIZE / 512 - 1) >> (PAGE_SHIFT - 9); + vcnt =3D (r1_bio->sectors + PAGE_SECTORS - 1) >> (PAGE_SHIFT - 9); for (i =3D 0; i < conf->raid_disks * 2; i++) { blk_status_t status; struct bio *b =3D r1_bio->bios[i]; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index c8768726d925..4a23fb9d5642 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include #include @@ -427,7 +428,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct devic= e *dev) =20 host->max_req_size =3D PAGE_SIZE; host->max_blk_size =3D 512; - host->max_blk_count =3D PAGE_SIZE / 512; + host->max_blk_count =3D PAGE_SECTORS; =20 host->fixed_drv_type =3D -EINVAL; host->ios.power_delay_ms =3D 10; diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index f0068e96a177..e6b29e54d07a 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -852,7 +852,7 @@ static int scsifront_probe(struct xenbus_device *dev, host->max_id =3D VSCSIIF_MAX_TARGET; host->max_channel =3D 0; host->max_lun =3D VSCSIIF_MAX_LUN; - host->max_sectors =3D (host->sg_tablesize - 1) * PAGE_SIZE / 512; + host->max_sectors =3D (host->sg_tablesize - 1) * PAGE_SECTORS; host->max_cmd_len =3D VSCSIIF_MAX_COMMAND_SIZE; =20 err =3D scsi_add_host(host, &dev->dev); @@ -1073,7 +1073,7 @@ static void scsifront_read_backend_params(struct xenb= us_device *dev, host->sg_tablesize, nr_segs); =20 host->sg_tablesize =3D nr_segs; - host->max_sectors =3D (nr_segs - 1) * PAGE_SIZE / 512; + host->max_sectors =3D (nr_segs - 1) * PAGE_SECTORS; } =20 static void scsifront_backend_changed(struct xenbus_device *dev, diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7c84c4c027c4..60505fc156c5 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -29,7 +29,7 @@ struct iomap_page { atomic_t read_count; atomic_t write_count; spinlock_t uptodate_lock; - DECLARE_BITMAP(uptodate, PAGE_SIZE / 512); + DECLARE_BITMAP(uptodate, PAGE_SECTORS); }; =20 static inline struct iomap_page *to_iomap_page(struct page *page) diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklay= out.h index 716bc75e9ed2..22407751e0fd 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h @@ -40,8 +40,6 @@ #include "../pnfs.h" #include "../netns.h" =20 -#define PAGE_CACHE_SECTORS (PAGE_SIZE >> SECTOR_SHIFT) -#define PAGE_CACHE_SECTOR_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) #define SECTOR_SIZE (1 << SECTOR_SHIFT) =20 struct pnfs_block_dev; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 053ea4b51988..98b2cbd0299a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -910,6 +910,10 @@ static inline struct request_queue *bdev_get_queue(str= uct block_device *bdev) #define SECTOR_SIZE (1 << SECTOR_SHIFT) #endif =20 +#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) +#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) +#define PAGE_SECTORS_MASK (~(PAGE_SECTORS - 1)) + /* * blk_rq_pos() : the current sector * blk_rq_bytes() : bytes left in the entire request diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 475668c69dbc..c98a533f8ffa 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -141,7 +141,6 @@ typedef long (*dm_dax_direct_access_fn) (struct dm_targ= et *ti, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn); typedef size_t (*dm_dax_copy_iter_fn)(struct dm_target *ti, pgoff_t pgoff, void *addr, size_t bytes, struct iov_iter *i); -#define PAGE_SECTORS (PAGE_SIZE / 512) =20 void dm_error(const char *message); =20 --=20 2.24.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel