| Message ID | 20231126124720.1249310-8-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [01/13] iomap: clear the per-folio dirty bits on all writeback failures | expand |
Christoph Hellwig <hch@lst.de> writes: > 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> > --- > fs/iomap/buffered-io.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) Straight forward change. Looks good to me. Please feel free to add - Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
On Mon, Nov 27, 2023 at 01:13:29PM +0530, Ritesh Harjani wrote: > Christoph Hellwig <hch@lst.de> writes: > > > 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> > > --- > > fs/iomap/buffered-io.c | 11 +++++------ > > 1 file changed, 5 insertions(+), 6 deletions(-) > > Straight forward change. Looks good to me. Please feel free to add - Also the subject should be changed now that I'm reading your reply. I dropped the rename of this function that I had in earlier versions.
On Mon, Nov 27, 2023 at 09:13:43AM +0100, Christoph Hellwig wrote: > On Mon, Nov 27, 2023 at 01:13:29PM +0530, Ritesh Harjani wrote: > > Christoph Hellwig <hch@lst.de> writes: > > > > > 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> > > > --- > > > fs/iomap/buffered-io.c | 11 +++++------ > > > 1 file changed, 5 insertions(+), 6 deletions(-) > > > > Straight forward change. Looks good to me. Please feel free to add - > > Also the subject should be changed now that I'm reading your reply. > I dropped the rename of this function that I had in earlier versions. With that fixed, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 5834aa46bdb8cf..7f86d2f90e3863 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1742,11 +1742,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); @@ -1889,8 +1889,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)
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> --- fs/iomap/buffered-io.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)