On Mon, Jul 19, 2021 at 12:34:55PM +0200, Christoph Hellwig wrote:
> These aren't actually used by the only instance implementing the methods.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
/me finds it kind of amusing that we still don't have any ->page_prepare
use cases for actually passing the page in, but if nobody /else/ has any
objection or imminently wants to use the iomap argument, then...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/gfs2/bmap.c | 5 ++---
> fs/iomap/buffered-io.c | 6 +++---
> include/linux/iomap.h | 5 ++---
> 3 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
> index ed8b67b2171817..5414c2c3358092 100644
> --- a/fs/gfs2/bmap.c
> +++ b/fs/gfs2/bmap.c
> @@ -1002,7 +1002,7 @@ static void gfs2_write_unlock(struct inode *inode)
> }
>
> static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,
> - unsigned len, struct iomap *iomap)
> + unsigned len)
> {
> unsigned int blockmask = i_blocksize(inode) - 1;
> struct gfs2_sbd *sdp = GFS2_SB(inode);
> @@ -1013,8 +1013,7 @@ static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,
> }
>
> static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
> - unsigned copied, struct page *page,
> - struct iomap *iomap)
> + unsigned copied, struct page *page)
> {
> struct gfs2_trans *tr = current->journal_info;
> struct gfs2_inode *ip = GFS2_I(inode);
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 87ccb3438becd9..75310f6fcf8401 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -605,7 +605,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
> return -EINTR;
>
> if (page_ops && page_ops->page_prepare) {
> - status = page_ops->page_prepare(inode, pos, len, iomap);
> + status = page_ops->page_prepare(inode, pos, len);
> if (status)
> return status;
> }
> @@ -638,7 +638,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
>
> out_no_page:
> if (page_ops && page_ops->page_done)
> - page_ops->page_done(inode, pos, 0, NULL, iomap);
> + page_ops->page_done(inode, pos, 0, NULL);
> return status;
> }
>
> @@ -714,7 +714,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len,
> if (old_size < pos)
> pagecache_isize_extended(inode, old_size, pos);
> if (page_ops && page_ops->page_done)
> - page_ops->page_done(inode, pos, ret, page, iomap);
> + page_ops->page_done(inode, pos, ret, page);
> put_page(page);
>
> if (ret < len)
> diff --git a/include/linux/iomap.h b/include/linux/iomap.h
> index 479c1da3e2211e..093519d91cc9cc 100644
> --- a/include/linux/iomap.h
> +++ b/include/linux/iomap.h
> @@ -108,10 +108,9 @@ iomap_sector(struct iomap *iomap, loff_t pos)
> * associated page could not be obtained.
> */
> struct iomap_page_ops {
> - int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len,
> - struct iomap *iomap);
> + int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len);
> void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
> - struct page *page, struct iomap *iomap);
> + struct page *page);
> };
>
> /*
> --
> 2.30.2
>
