From: Christoph Hellwig Date: Thu, 10 Jul 2025 13:33:32 +0000 (+0200) Subject: iomap: rename iomap_writepage_map to iomap_writeback_folio X-Git-Tag: v6.17-rc1~212^2~1^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f0d5a30427738118c19e195e9b8897e52afddb;p=thirdparty%2Flinux.git 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: Christoph Hellwig Link: https://lore.kernel.org/20250710133343.399917-9-hch@lst.de Reviewed-by: Brian Foster Reviewed-by: Joanne Koong Reviewed-by: Darrick J. Wong Signed-off-by: Christian Brauner --- diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index cea56df04d7ba..e6e4c2d1b3995 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -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 diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h index aaea02c9560a3..6ad66e6ba653e 100644 --- a/fs/iomap/trace.h +++ b/fs/iomap/trace.h @@ -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);