Skip to content

Commit d466824

Browse files
Christoph Hellwigkawasaki
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]> Reviewed-by: Brian Foster <[email protected]> Reviewed-by: Joanne Koong <[email protected]> Reviewed-by: "Darrick J. Wong" <[email protected]>
1 parent 053703c commit d466824

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

fs/iomap/buffered-io.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ static int iomap_writeback_range(struct iomap_writepage_ctx *wpc,
15851585
* If the folio is entirely beyond i_size, return false. If it straddles
15861586
* i_size, adjust end_pos and zero all data beyond i_size.
15871587
*/
1588-
static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
1588+
static bool iomap_writeback_handle_eof(struct folio *folio, struct inode *inode,
15891589
u64 *end_pos)
15901590
{
15911591
u64 isize = i_size_read(inode);
@@ -1637,7 +1637,7 @@ static bool iomap_writepage_handle_eof(struct folio *folio, struct inode *inode,
16371637
return true;
16381638
}
16391639

1640-
static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
1640+
static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,
16411641
struct folio *folio)
16421642
{
16431643
struct iomap_folio_state *ifs = folio->private;
@@ -1653,9 +1653,9 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
16531653
WARN_ON_ONCE(folio_test_dirty(folio));
16541654
WARN_ON_ONCE(folio_test_writeback(folio));
16551655

1656-
trace_iomap_writepage(inode, pos, folio_size(folio));
1656+
trace_iomap_writeback_folio(inode, pos, folio_size(folio));
16571657

1658-
if (!iomap_writepage_handle_eof(folio, inode, &end_pos)) {
1658+
if (!iomap_writeback_handle_eof(folio, inode, &end_pos)) {
16591659
folio_unlock(folio);
16601660
return 0;
16611661
}
@@ -1740,7 +1740,7 @@ iomap_writepages(struct iomap_writepage_ctx *wpc)
17401740
return -EIO;
17411741

17421742
while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error)))
1743-
error = iomap_writepage_map(wpc, folio);
1743+
error = iomap_writeback_folio(wpc, folio);
17441744

17451745
/*
17461746
* 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)