Skip to content

Commit 609c5e0

Browse files
LiBaokun96tytso
authored andcommitted
ext4: support large block size in ext4_readdir()
In ext4_readdir(), page_cache_sync_readahead() is used to readahead mapped physical blocks. With LBS support, this can lead to a negative right shift. To fix this, the page index is now calculated by first converting the physical block number (pblk) to a file position (pos) before converting it to a page index. Also, the correct number of pages to readahead is now passed. 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: Pankaj Raghav <p.raghav@samsung.com> Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Message-ID: <20251121090654.631996-9-libaokun@huaweicloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 6a28b5c commit 609c5e0

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fs/ext4/dir.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
192192
continue;
193193
}
194194
if (err > 0) {
195-
pgoff_t index = map.m_pblk >>
196-
(PAGE_SHIFT - inode->i_blkbits);
195+
pgoff_t index = map.m_pblk << inode->i_blkbits >>
196+
PAGE_SHIFT;
197197
if (!ra_has_index(&file->f_ra, index))
198198
page_cache_sync_readahead(
199199
sb->s_bdev->bd_mapping,
200-
&file->f_ra, file,
201-
index, 1);
200+
&file->f_ra, file, index,
201+
1 << EXT4_SB(sb)->s_min_folio_order);
202202
file->f_ra.prev_pos = (loff_t)index << PAGE_SHIFT;
203203
bh = ext4_bread(NULL, inode, map.m_lblk, 0);
204204
if (IS_ERR(bh)) {

0 commit comments

Comments
 (0)