Unverified Commit c0f8658a authored by Brian Foster's avatar Brian Foster Committed by Christian Brauner
Browse files

iomap: push non-large folio check into get folio path 



The len param to __iomap_get_folio() is primarily a folio allocation
hint. iomap_write_begin() already trims its local len variable based
on the provided folio, so move the large folio support check closer
to folio lookup.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Link: https://lore.kernel.org/20250506134118.911396-6-bfoster@redhat.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent c4f9a1ba

fs/iomap/buffered-io.c

+3 −3
Original line number Diff line number Diff line
@@ -746,6 +746,9 @@ static struct folio *__iomap_get_folio(struct iomap_iter *iter, size_t len) 
	const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops;

	loff_t pos = iter->pos;



	if (!mapping_large_folio_support(iter->inode->i_mapping))

		len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));



	if (folio_ops && folio_ops->get_folio)

		return folio_ops->get_folio(iter, pos, len);

	else
@@ -807,9 +810,6 @@ static int iomap_write_begin(struct iomap_iter *iter, size_t len, 
	if (fatal_signal_pending(current))

		return -EINTR;



	if (!mapping_large_folio_support(iter->inode->i_mapping))

		len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));



	folio = __iomap_get_folio(iter, len);

	if (IS_ERR(folio))

		return PTR_ERR(folio);