[PATCH 1/5] dm integrity: simplify by using PAGE_SECTORS_SHIFT

Luis Chamberlain
2023-04-21T19:58:44Z

The PAGE_SHIFT - SECTOR_SHIFT constant be replaced with PAGE_SECTORS_SHIFT
defined in linux/blt_types.h, which is included by linux/blkdev.h.

This produces no functional changes.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
drivers/md/dm-integrity.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 31838b13ea54..a179265970dd 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -752,7 +752,7 @@ static void page_list_location(struct dm_integrity_c *ic, unsigned int section,

sector = section * ic->journal_section_sectors + offset;

- *pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);
+ *pl_index = sector >> (PAGE_SECTORS_SHIFT);
*pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);
}

@@ -1077,7 +1077,7 @@ static void rw_journal_sectors(struct dm_integrity_c *ic, blk_opf_t opf,
return;
}

- pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);
+ pl_index = sector >> (PAGE_SECTORS_SHIFT);
pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);

io_req.bi_opf = opf;
@@ -1201,7 +1201,7 @@ static void copy_from_journal(struct dm_integrity_c *ic, unsigned int section, u

sector = section * ic->journal_section_sectors + JOURNAL_BLOCK_SECTORS + offset;

- pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);
+ pl_index = sector >> (PAGE_SECTORS_SHIFT);
pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);

io_req.bi_opf = REQ_OP_WRITE;
@@ -3765,7 +3765,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
ic->commit_ids[3] = cpu_to_le64(0x4444444444444444ULL);

journal_pages = roundup((__u64)ic->journal_sections * ic->journal_section_sectors,
- PAGE_SIZE >> SECTOR_SHIFT) >> (PAGE_SHIFT - SECTOR_SHIFT);
+ PAGE_SIZE >> SECTOR_SHIFT) >> (PAGE_SECTORS_SHIFT);
journal_desc_size = journal_pages * sizeof(struct page_list);
if (journal_pages >= totalram_pages() - totalhigh_pages() || journal_desc_size > ULONG_MAX) {
*error = "Journal doesn't fit into memory";
@@ -4542,7 +4542,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv
spin_lock_init(&bbs->bio_queue_lock);

sector = i * (BITMAP_BLOCK_SIZE >> SECTOR_SHIFT);
- pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);
+ pl_index = sector >> (PAGE_SECTORS_SHIFT);
pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);

bbs->bitmap = lowmem_page_address(ic->journal[pl_index].page) + pl_offset;
--
2.39.2