On Wed, Apr 30, 2025 at 03:01:09PM -0400, Brian Foster wrote:
> Both helpers take the iter and pos as parameters. All callers
> effectively pass iter->pos, so drop the unnecessary pos parameter.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
Looks ok,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> fs/iomap/buffered-io.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index d1a50300a5dc..5c08b2916bc7 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -741,10 +741,10 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
> return 0;
> }
>
> -static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos,
> - size_t len)
> +static struct folio *__iomap_get_folio(struct iomap_iter *iter, size_t len)
> {
> const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops;
> + loff_t pos = iter->pos;
>
> if (folio_ops && folio_ops->get_folio)
> return folio_ops->get_folio(iter, pos, len);
> @@ -752,10 +752,11 @@ static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos,
> return iomap_get_folio(iter, pos, len);
> }
>
> -static void __iomap_put_folio(struct iomap_iter *iter, loff_t pos, size_t ret,
> +static void __iomap_put_folio(struct iomap_iter *iter, size_t ret,
> struct folio *folio)
> {
> const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops;
> + loff_t pos = iter->pos;
>
> if (folio_ops && folio_ops->put_folio) {
> folio_ops->put_folio(iter->inode, pos, ret, folio);
> @@ -793,7 +794,7 @@ static int iomap_write_begin(struct iomap_iter *iter, size_t len,
> if (!mapping_large_folio_support(iter->inode->i_mapping))
> len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));
>
> - folio = __iomap_get_folio(iter, pos, len);
> + folio = __iomap_get_folio(iter, len);
> if (IS_ERR(folio))
> return PTR_ERR(folio);
>
> @@ -834,7 +835,7 @@ static int iomap_write_begin(struct iomap_iter *iter, size_t len,
> return 0;
>
> out_unlock:
> - __iomap_put_folio(iter, pos, 0, folio);
> + __iomap_put_folio(iter, 0, folio);
>
> return status;
> }
> @@ -983,7 +984,7 @@ static int iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)
> i_size_write(iter->inode, pos + written);
> iter->iomap.flags |= IOMAP_F_SIZE_CHANGED;
> }
> - __iomap_put_folio(iter, pos, written, folio);
> + __iomap_put_folio(iter, written, folio);
>
> if (old_size < pos)
> pagecache_isize_extended(iter->inode, old_size, pos);
> @@ -1295,7 +1296,7 @@ static int iomap_unshare_iter(struct iomap_iter *iter)
> bytes = folio_size(folio) - offset;
>
> ret = iomap_write_end(iter, bytes, bytes, folio);
> - __iomap_put_folio(iter, pos, bytes, folio);
> + __iomap_put_folio(iter, bytes, folio);
> if (WARN_ON_ONCE(!ret))
> return -EIO;
>
> @@ -1376,7 +1377,7 @@ static int iomap_zero_iter(struct iomap_iter *iter, bool *did_zero)
> folio_mark_accessed(folio);
>
> ret = iomap_write_end(iter, bytes, bytes, folio);
> - __iomap_put_folio(iter, pos, bytes, folio);
> + __iomap_put_folio(iter, bytes, folio);
> if (WARN_ON_ONCE(!ret))
> return -EIO;
>
> --
> 2.49.0
>
>
