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

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
...@@ -1002,7 +1002,7 @@ static void gfs2_write_unlock(struct inode *inode) ...@@ -1002,7 +1002,7 @@ static void gfs2_write_unlock(struct inode *inode)
} }
static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, 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; unsigned int blockmask = i_blocksize(inode) - 1;
struct gfs2_sbd *sdp = GFS2_SB(inode); struct gfs2_sbd *sdp = GFS2_SB(inode);
...@@ -1013,8 +1013,7 @@ static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, ...@@ -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, static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
unsigned copied, struct page *page, unsigned copied, struct page *page)
struct iomap *iomap)
{ {
struct gfs2_trans *tr = current->journal_info; struct gfs2_trans *tr = current->journal_info;
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
......
...@@ -615,7 +615,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, ...@@ -615,7 +615,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
return -EINTR; return -EINTR;
if (page_ops && page_ops->page_prepare) { 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) if (status)
return status; return status;
} }
...@@ -648,7 +648,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, ...@@ -648,7 +648,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
out_no_page: out_no_page:
if (page_ops && page_ops->page_done) 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; return status;
} }
...@@ -724,7 +724,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len, ...@@ -724,7 +724,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len,
if (old_size < pos) if (old_size < pos)
pagecache_isize_extended(inode, old_size, pos); pagecache_isize_extended(inode, old_size, pos);
if (page_ops && page_ops->page_done) 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); put_page(page);
if (ret < len) if (ret < len)
......
...@@ -126,10 +126,9 @@ static inline bool iomap_inline_data_valid(struct iomap *iomap) ...@@ -126,10 +126,9 @@ static inline bool iomap_inline_data_valid(struct iomap *iomap)
* associated page could not be obtained. * associated page could not be obtained.
*/ */
struct iomap_page_ops { struct iomap_page_ops {
int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len, int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len);
struct iomap *iomap);
void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
struct page *page, struct iomap *iomap); struct page *page);
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment