diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2023-01-15 08:50:44 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2023-01-18 10:44:05 -0800 |
| commit | 471859f57d42537626a56312cfb50cd6acee09ae (patch) | |
| tree | 65cb551662ae2a37cc73665c83f9ce35b74736e6 /fs/iomap | |
| parent | c82abc2394642490da736b1ba78671bbcef81150 (diff) | |
| download | linux-471859f57d42537626a56312cfb50cd6acee09ae.tar.gz linux-471859f57d42537626a56312cfb50cd6acee09ae.tar.bz2 linux-471859f57d42537626a56312cfb50cd6acee09ae.zip | |
iomap: Rename page_ops to folio_ops
The operations in struct page_ops all operate on folios, so rename
struct page_ops to struct folio_ops.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[djwong: port around not removing iomap_valid]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/iomap')
| -rw-r--r-- | fs/iomap/buffered-io.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 006ddf933948..d3c300563eb8 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -605,10 +605,10 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos, static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len) { - const struct iomap_page_ops *page_ops = iter->iomap.page_ops; + const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops; - if (page_ops && page_ops->get_folio) - return page_ops->get_folio(iter, pos, len); + if (folio_ops && folio_ops->get_folio) + return folio_ops->get_folio(iter, pos, len); else return iomap_get_folio(iter, pos); } @@ -616,10 +616,10 @@ static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos, static void __iomap_put_folio(struct iomap_iter *iter, loff_t pos, size_t ret, struct folio *folio) { - const struct iomap_page_ops *page_ops = iter->iomap.page_ops; + const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops; - if (page_ops && page_ops->put_folio) { - page_ops->put_folio(iter->inode, pos, ret, folio); + if (folio_ops && folio_ops->put_folio) { + folio_ops->put_folio(iter->inode, pos, ret, folio); } else { folio_unlock(folio); folio_put(folio); @@ -638,7 +638,7 @@ static int iomap_write_begin_inline(const struct iomap_iter *iter, static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, size_t len, struct folio **foliop) { - const struct iomap_page_ops *page_ops = iter->iomap.page_ops; + const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops; const struct iomap *srcmap = iomap_iter_srcmap(iter); struct folio *folio; int status = 0; @@ -667,9 +667,9 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, * could do the wrong thing here (zero a page range incorrectly or fail * to zero) and corrupt data. */ - if (page_ops && page_ops->iomap_valid) { - bool iomap_valid = page_ops->iomap_valid(iter->inode, - &iter->iomap); + if (folio_ops && folio_ops->iomap_valid) { + bool iomap_valid = folio_ops->iomap_valid(iter->inode, + &iter->iomap); if (!iomap_valid) { iter->iomap.flags |= IOMAP_F_STALE; status = 0; |