Skip to content

Commit 58f0d5a

Browse files
Christoph Hellwigbrauner
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/[email protected] Reviewed-by: Brian Foster <[email protected]> Reviewed-by: Joanne Koong <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 8f02cec commit 58f0d5a

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
@@ -1582,7 +1582,7 @@ static int iomap_writeback_range(struct iomap_writepage_ctx *wpc,
15821582
* If the folio is entirely beyond i_size, return false. If it straddles
15831583
* i_size, adjust end_pos and zero all data beyond i_size.
15841584
*/
1585-
static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
1585+
static bool iomap_writeback_handle_eof(struct folio *folio, struct inode *inode,
15861586
u64 *end_pos)
15871587
{
15881588
u64 isize = i_size_read(inode);
@@ -1634,7 +1634,7 @@ static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
16341634
return true;
16351635
}
16361636

1637-
static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
1637+
static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,
16381638
struct folio *folio)
16391639
{
16401640
struct iomap_folio_state *ifs = folio->private;
@@ -1650,9 +1650,9 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
16501650
WARN_ON_ONCE(folio_test_dirty(folio));
16511651
WARN_ON_ONCE(folio_test_writeback(folio));
16521652

1653-
trace_iomap_writepage(inode, pos, folio_size(folio));
1653+
trace_iomap_writeback_folio(inode, pos, folio_size(folio));
16541654

1655-
if (!iomap_writepage_handle_eof(folio, inode, &end_pos)) {
1655+
if (!iomap_writeback_handle_eof(folio, inode, &end_pos)) {
16561656
folio_unlock(folio);
16571657
return 0;
16581658
}
@@ -1737,7 +1737,7 @@ iomap_writepages(struct iomap_writepage_ctx *wpc)
17371737
return -EIO;
17381738

17391739
while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error)))
1740-
error = iomap_writepage_map(wpc, folio);
1740+
error = iomap_writeback_folio(wpc, folio);
17411741

17421742
/*
17431743
* 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)