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 <hch@lst.de>
Link: https://lore.kernel.org/20250710133343.399917-9-hch@lst.de
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Joanne Koong <joannelkoong@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index cea56df04d7ba92c7fac723d0fe9d7f3b679a501..e6e4c2d1b3995b82a60f0084377a7eb295ad354b 100644 (file)
--- 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 aaea02c9560a3ebc580e58a318fe9c41bc45b2c5..6ad66e6ba653e8c60efad399fc29e31e3ff323e7 100644 (file)
--- 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);