Skip to content

Commit 7edfc61

Browse files
Christoph Hellwigbrauner
authored andcommitted
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>
1 parent cc95425 commit 7edfc61

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

fs/iomap/buffered-io.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,11 +1732,11 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset,
17321732
* Test to see if we have an existing ioend structure that we could append to
17331733
* first; otherwise finish off the current ioend and start another.
17341734
*/
1735-
static void
1736-
iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio,
1737-
struct iomap_folio_state *ifs, struct iomap_writepage_ctx *wpc,
1738-
struct writeback_control *wbc, struct list_head *iolist)
1735+
static void iomap_add_to_ioend(struct iomap_writepage_ctx *wpc,
1736+
struct writeback_control *wbc, struct folio *folio,
1737+
struct inode *inode, loff_t pos, struct list_head *iolist)
17391738
{
1739+
struct iomap_folio_state *ifs = folio->private;
17401740
sector_t sector = iomap_sector(&wpc->iomap, pos);
17411741
unsigned len = i_blocksize(inode);
17421742
size_t poff = offset_in_folio(folio, pos);
@@ -1879,8 +1879,7 @@ static int iomap_writepage_map(struct iomap_writepage_ctx *wpc,
18791879
}
18801880
if (wpc->iomap.type == IOMAP_HOLE)
18811881
continue;
1882-
iomap_add_to_ioend(inode, pos, folio, ifs, wpc, wbc,
1883-
&submit_list);
1882+
iomap_add_to_ioend(wpc, wbc, folio, inode, pos, &submit_list);
18841883
count++;
18851884
}
18861885
if (count)

0 commit comments

Comments
 (0)