| Message ID | 20221231150919.659533-7-agruenba@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Turn iomap_page_ops into iomap_folio_ops | expand |
On Sat, Dec 31, 2022 at 04:09:16PM +0100, Andreas Gruenbacher wrote: > 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> Looks good to me, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/gfs2/bmap.c | 6 +++--- > fs/iomap/buffered-io.c | 4 ++-- > include/linux/iomap.h | 6 +++--- > 3 files changed, 8 insertions(+), 8 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 @@ static int __gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, > } > > 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 7decd8cdc755..4f363d42dbaf 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -642,8 +642,8 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, > if (!mapping_large_folio_support(iter->inode->i_mapping)) > len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos)); > > - if (page_ops && page_ops->page_prepare) > - folio = page_ops->page_prepare(iter, pos, len); > + if (page_ops && page_ops->get_folio) > + folio = page_ops->get_folio(iter, pos, len); > else > folio = iomap_get_folio(iter, pos); > if (IS_ERR(folio)) > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index 87b5d0f8e578..dd3575ada5d1 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -126,17 +126,17 @@ static inline bool iomap_inline_data_valid(const struct iomap *iomap) > } > > /* > - * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare > + * When a filesystem sets page_ops in an iomap mapping it returns, get_folio > * and put_folio will be called for each page written to. This only applies to > * buffered writes as unbuffered writes will not typically have pages > * associated with them. > * > - * When page_prepare succeeds, put_folio will always be called to do any > + * When get_folio succeeds, put_folio will always be called to do any > * cleanup work necessary. put_folio is responsible for unlocking and putting > * @folio. > */ > struct iomap_page_ops { > - struct folio *(*page_prepare)(struct iomap_iter *iter, loff_t pos, > + struct folio *(*get_folio)(struct iomap_iter *iter, loff_t pos, > unsigned len); > void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied, > struct folio *folio); > -- > 2.38.1 >
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
although it might make sense to just do the rename in patch 5 which
changes the signature to return a folio?
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 @@ static int __gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, } 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 7decd8cdc755..4f363d42dbaf 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -642,8 +642,8 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, if (!mapping_large_folio_support(iter->inode->i_mapping)) len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos)); - if (page_ops && page_ops->page_prepare) - folio = page_ops->page_prepare(iter, pos, len); + if (page_ops && page_ops->get_folio) + folio = page_ops->get_folio(iter, pos, len); else folio = iomap_get_folio(iter, pos); if (IS_ERR(folio)) diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 87b5d0f8e578..dd3575ada5d1 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -126,17 +126,17 @@ static inline bool iomap_inline_data_valid(const struct iomap *iomap) } /* - * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare + * When a filesystem sets page_ops in an iomap mapping it returns, get_folio * and put_folio will be called for each page written to. This only applies to * buffered writes as unbuffered writes will not typically have pages * associated with them. * - * When page_prepare succeeds, put_folio will always be called to do any + * When get_folio succeeds, put_folio will always be called to do any * cleanup work necessary. put_folio is responsible for unlocking and putting * @folio. */ struct iomap_page_ops { - struct folio *(*page_prepare)(struct iomap_iter *iter, loff_t pos, + struct folio *(*get_folio)(struct iomap_iter *iter, loff_t pos, unsigned len); void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied, struct folio *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> --- fs/gfs2/bmap.c | 6 +++--- fs/iomap/buffered-io.c | 4 ++-- include/linux/iomap.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)