Skip to content

Commit 9ae0f92

Browse files
author
Brian Foster
committed
iomap: rename iomap_writepage_map to iomap_writeback_folio
JIRA: https://issues.redhat.com/browse/RHEL-121230 commit 58f0d5a Author: Christoph Hellwig <hch@lst.de> Date: Thu Jul 10 15:33:32 2025 +0200 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> Signed-off-by: Brian Foster <bfoster@redhat.com>
1 parent 96a9c04 commit 9ae0f92

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

fs/iomap/buffered-io.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ static int iomap_writeback_range(struct iomap_writepage_ctx *wpc,
15811581
* If the folio is entirely beyond i_size, return false. If it straddles
15821582
* i_size, adjust end_pos and zero all data beyond i_size.
15831583
*/
1584-
static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
1584+
static bool iomap_writeback_handle_eof(struct folio *folio, struct inode *inode,
15851585
u64 *end_pos)
15861586
{
15871587
u64 isize = i_size_read(inode);
@@ -1633,7 +1633,7 @@ static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
16331633
return true;
16341634
}
16351635

1636-
static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
1636+
static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,
16371637
struct folio *folio)
16381638
{
16391639
struct iomap_folio_state *ifs = folio->private;
@@ -1649,9 +1649,9 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
16491649
WARN_ON_ONCE(folio_test_dirty(folio));
16501650
WARN_ON_ONCE(folio_test_writeback(folio));
16511651

1652-
trace_iomap_writepage(inode, pos, folio_size(folio));
1652+
trace_iomap_writeback_folio(inode, pos, folio_size(folio));
16531653

1654-
if (!iomap_writepage_handle_eof(folio, inode, &end_pos)) {
1654+
if (!iomap_writeback_handle_eof(folio, inode, &end_pos)) {
16551655
folio_unlock(folio);
16561656
return 0;
16571657
}
@@ -1736,7 +1736,7 @@ iomap_writepages(struct iomap_writepage_ctx *wpc)
17361736
return -EIO;
17371737

17381738
while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error)))
1739-
error = iomap_writepage_map(wpc, folio);
1739+
error = iomap_writeback_folio(wpc, folio);
17401740

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

fs/iomap/trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ DECLARE_EVENT_CLASS(iomap_range_class,
7979
DEFINE_EVENT(iomap_range_class, name, \
8080
TP_PROTO(struct inode *inode, loff_t off, u64 len),\
8181
TP_ARGS(inode, off, len))
82-
DEFINE_RANGE_EVENT(iomap_writepage);
82+
DEFINE_RANGE_EVENT(iomap_writeback_folio);
8383
DEFINE_RANGE_EVENT(iomap_release_folio);
8484
DEFINE_RANGE_EVENT(iomap_invalidate_folio);
8585
DEFINE_RANGE_EVENT(iomap_dio_invalidate_fail);

0 commit comments

Comments
 (0)