diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2023-01-15 08:50:25 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2023-01-18 10:44:05 -0800 |
| commit | c82abc2394642490da736b1ba78671bbcef81150 (patch) | |
| tree | 8e4e8485959abdcdaa74b5fe8187d5c9bf27f0c3 /fs | |
| parent | 07c22b56685dd75ae9c2d41a4cd9f4bbfe93a53a (diff) | |
| download | linux-stable-c82abc2394642490da736b1ba78671bbcef81150.tar.gz linux-stable-c82abc2394642490da736b1ba78671bbcef81150.tar.bz2 linux-stable-c82abc2394642490da736b1ba78671bbcef81150.zip | |
iomap: Rename page_prepare handler to get_folio
The ->page_prepare() handler in struct iomap_page_ops is now somewhat
misnamed, so rename it to ->get_folio().
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/bmap.c | 6 | ||||
| -rw-r--r-- | fs/iomap/buffered-io.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 41349e09558b..d3adb715ac8c 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -957,7 +957,7 @@ hole_found: } static struct folio * -gfs2_iomap_page_prepare(struct iomap_iter *iter, loff_t pos, unsigned len) +gfs2_iomap_get_folio(struct iomap_iter *iter, loff_t pos, unsigned len) { struct inode *inode = iter->inode; unsigned int blockmask = i_blocksize(inode) - 1; @@ -998,7 +998,7 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos, } static const struct iomap_page_ops gfs2_iomap_page_ops = { - .page_prepare = gfs2_iomap_page_prepare, + .get_folio = gfs2_iomap_get_folio, .put_folio = gfs2_iomap_put_folio, }; @@ -1291,7 +1291,7 @@ int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock, /* * NOTE: Never call gfs2_block_zero_range with an open transaction because it * uses iomap write to perform its actions, which begin their own transactions - * (iomap_begin, page_prepare, etc.) + * (iomap_begin, get_folio, etc.) */ static int gfs2_block_zero_range(struct inode *inode, loff_t from, unsigned int length) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 666107c3a385..006ddf933948 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -607,8 +607,8 @@ static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos, { const struct iomap_page_ops *page_ops = iter->iomap.page_ops; - if (page_ops && page_ops->page_prepare) - return page_ops->page_prepare(iter, pos, len); + if (page_ops && page_ops->get_folio) + return page_ops->get_folio(iter, pos, len); else return iomap_get_folio(iter, pos); } |