Commit c82abc23 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Darrick J. Wong
Browse files

iomap: Rename page_prepare handler to get_folio 



The ->page_prepare() handler in struct iomap_page_ops is now somewhat
misnamed, so rename it to ->get_folio().

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 07c22b56

fs/gfs2/bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static int __gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, 
}



static struct folio *

gfs2_iomap_page_prepare(struct iomap_iter *iter, loff_t pos, unsigned len)

gfs2_iomap_get_folio(struct iomap_iter *iter, loff_t pos, unsigned len)

{

	struct inode *inode = iter->inode;

	unsigned int blockmask = i_blocksize(inode) - 1;
@@ -998,7 +998,7 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos, 
}



static const struct iomap_page_ops gfs2_iomap_page_ops = {

	.page_prepare = gfs2_iomap_page_prepare,

	.get_folio = gfs2_iomap_get_folio,

	.put_folio = gfs2_iomap_put_folio,

};
@@ -1291,7 +1291,7 @@ int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock, 
/*

 * NOTE: Never call gfs2_block_zero_range with an open transaction because it

 * uses iomap write to perform its actions, which begin their own transactions

 * (iomap_begin, page_prepare, etc.)

 * (iomap_begin, get_folio, etc.)

 */

static int gfs2_block_zero_range(struct inode *inode, loff_t from,

				 unsigned int length)

fs/iomap/buffered-io.c

+2 −2
Original line number Diff line number Diff line
@@ -607,8 +607,8 @@ static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos, 
{

	const struct iomap_page_ops *page_ops = iter->iomap.page_ops;



	if (page_ops && page_ops->page_prepare)

		return page_ops->page_prepare(iter, pos, len);

	if (page_ops && page_ops->get_folio)

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

	else

		return iomap_get_folio(iter, pos);

}

include/linux/iomap.h

+3 −3
Original line number Diff line number Diff line
@@ -126,17 +126,17 @@ static inline bool iomap_inline_data_valid(const struct iomap *iomap) 
}



/*

 * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare

 * When a filesystem sets page_ops in an iomap mapping it returns, get_folio

 * and put_folio will be called for each folio written to.  This only applies

 * to buffered writes as unbuffered writes will not typically have folios

 * associated with them.

 *

 * When page_prepare succeeds, put_folio will always be called to do any

 * When get_folio succeeds, put_folio will always be called to do any

 * cleanup work necessary.  put_folio is responsible for unlocking and putting

 * @folio.

 */

struct iomap_page_ops {

	struct folio *(*page_prepare)(struct iomap_iter *iter, loff_t pos,

	struct folio *(*get_folio)(struct iomap_iter *iter, loff_t pos,

			unsigned len);

	void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied,

			struct folio *folio);