iomap: clean up the iomap_alloc_ioend calling convention

Switch to the same argument order as iomap_writepage_map and remove the
ifs argument that can be trivially recalculated.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231207072710.176093-8-hch@lst.de
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index e3175d3..92f032a 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1732,11 +1732,11 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset,
  * Test to see if we have an existing ioend structure that we could append to
  * first; otherwise finish off the current ioend and start another.
  */
-static void
-iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio,
-               struct iomap_folio_state *ifs, struct iomap_writepage_ctx *wpc,
-               struct writeback_control *wbc, struct list_head *iolist)
+static void iomap_add_to_ioend(struct iomap_writepage_ctx *wpc,
+               struct writeback_control *wbc, struct folio *folio,
+               struct inode *inode, loff_t pos, struct list_head *iolist)
 {
+       struct iomap_folio_state *ifs = folio->private;
        sector_t sector = iomap_sector(&wpc->iomap, pos);
        unsigned len = i_blocksize(inode);
        size_t poff = offset_in_folio(folio, pos);
@@ -1879,8 +1879,7 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
                }
                if (wpc->iomap.type == IOMAP_HOLE)
                        continue;
-               iomap_add_to_ioend(inode, pos, folio, ifs, wpc, wbc,
-                                &submit_list);
+               iomap_add_to_ioend(wpc, wbc, folio, inode, pos, &submit_list);
                count++;
        }
        if (count)