Skip to content

Commit a6d7324

Browse files
LiBaokun96tytso
authored andcommitted
ext4: support large block size in ext4_mpage_readpages()
Use the EXT4_PG_TO_LBLK() macro to convert folio indexes to blocks to avoid negative left shifts after supporting blocksize greater than PAGE_SIZE. Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Message-ID: <20251121090654.631996-17-libaokun@huaweicloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 65c3995 commit a6d7324

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

fs/ext4/readpage.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@ int ext4_mpage_readpages(struct inode *inode,
213213
{
214214
struct bio *bio = NULL;
215215
sector_t last_block_in_bio = 0;
216-
217216
const unsigned blkbits = inode->i_blkbits;
218-
const unsigned blocks_per_page = PAGE_SIZE >> blkbits;
219217
const unsigned blocksize = 1 << blkbits;
220218
sector_t next_block;
221219
sector_t block_in_file;
@@ -251,9 +249,8 @@ int ext4_mpage_readpages(struct inode *inode,
251249

252250
blocks_per_folio = folio_size(folio) >> blkbits;
253251
first_hole = blocks_per_folio;
254-
block_in_file = next_block =
255-
(sector_t)folio->index << (PAGE_SHIFT - blkbits);
256-
last_block = block_in_file + nr_pages * blocks_per_page;
252+
block_in_file = next_block = EXT4_PG_TO_LBLK(inode, folio->index);
253+
last_block = EXT4_PG_TO_LBLK(inode, folio->index + nr_pages);
257254
last_block_in_file = (ext4_readpage_limit(inode) +
258255
blocksize - 1) >> blkbits;
259256
if (last_block > last_block_in_file)

0 commit comments

Comments
 (0)