Commit 1d25d0ae authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: remove the iomap arguments to ->page_{prepare,done} 



These aren't actually used by the only instance implementing the methods.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent d9d381f3

fs/gfs2/bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

fs/iomap/buffered-io.c

+3 −3
Original line number Diff line number Diff line
@@ -615,7 +615,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;

	}
@@ -648,7 +648,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;

}
@@ -724,7 +724,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)

include/linux/iomap.h

+2 −3
Original line number Diff line number Diff line
@@ -126,10 +126,9 @@ static inline bool iomap_inline_data_valid(struct iomap *iomap) 
 * 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);

};



/*