Unverified Commit 58f0d5a3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

iomap: rename iomap_writepage_map to iomap_writeback_folio 



->writepage is gone, and our naming wasn't always that great to start
with.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/20250710133343.399917-9-hch@lst.de


Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarJoanne Koong <joannelkoong@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 8f02cecd

fs/iomap/buffered-io.c

+5 −5
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ static int iomap_writeback_range(struct iomap_writepage_ctx *wpc, 
 * If the folio is entirely beyond i_size, return false.  If it straddles

 * i_size, adjust end_pos and zero all data beyond i_size.

 */

static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,

static bool iomap_writeback_handle_eof(struct folio *folio, struct inode *inode,

		u64 *end_pos)

{

	u64 isize = i_size_read(inode);
@@ -1634,7 +1634,7 @@ static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode, 
	return true;

}



static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,

static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,

		struct folio *folio)

{

	struct iomap_folio_state *ifs = folio->private;
@@ -1650,9 +1650,9 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc, 
	WARN_ON_ONCE(folio_test_dirty(folio));

	WARN_ON_ONCE(folio_test_writeback(folio));



	trace_iomap_writepage(inode, pos, folio_size(folio));

	trace_iomap_writeback_folio(inode, pos, folio_size(folio));



	if (!iomap_writepage_handle_eof(folio, inode, &end_pos)) {

	if (!iomap_writeback_handle_eof(folio, inode, &end_pos)) {

		folio_unlock(folio);

		return 0;

	}
@@ -1737,7 +1737,7 @@ iomap_writepages(struct iomap_writepage_ctx *wpc) 
		return -EIO;



	while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error)))

		error = iomap_writepage_map(wpc, folio);

		error = iomap_writeback_folio(wpc, folio);



	/*

	 * If @error is non-zero, it means that we have a situation where some

fs/iomap/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ DECLARE_EVENT_CLASS(iomap_range_class, 
DEFINE_EVENT(iomap_range_class, name,	\

	TP_PROTO(struct inode *inode, loff_t off, u64 len),\

	TP_ARGS(inode, off, len))

DEFINE_RANGE_EVENT(iomap_writepage);

DEFINE_RANGE_EVENT(iomap_writeback_folio);

DEFINE_RANGE_EVENT(iomap_release_folio);

DEFINE_RANGE_EVENT(iomap_invalidate_folio);

DEFINE_RANGE_EVENT(iomap_dio_invalidate_fail);