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

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index ed8b67b..5414c2c 100644 (file)
--- 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 43b9354..7e794a3 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -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 @@ out_unlock:
 
 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)

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index b8ec145..72696a5 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -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);
 };
 
 /*