diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-12-07 08:26:59 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-02-01 14:20:10 +0100 |
| commit | 432acd550e3607d5fea23e27f6ab4e4567deccfd (patch) | |
| tree | 7a4cec024197c512be57fcb09f19d0dc3f5576d7 /fs/iomap | |
| parent | 80d012e98894ac9112cbcddf2fbf276c2e4be0ec (diff) | |
| download | linux-stable-432acd550e3607d5fea23e27f6ab4e4567deccfd.tar.gz linux-stable-432acd550e3607d5fea23e27f6ab4e4567deccfd.tar.bz2 linux-stable-432acd550e3607d5fea23e27f6ab4e4567deccfd.zip | |
iomap: move the io_folios field out of struct iomap_ioend
The io_folios member in struct iomap_ioend counts the number of folios
added to an ioend. It is only used at submission time and can thus be
moved to iomap_writepage_ctx instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231207072710.176093-4-hch@lst.de
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/iomap')
| -rw-r--r-- | fs/iomap/buffered-io.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 1492706cdc3d..c013d35b07b7 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1675,10 +1675,11 @@ iomap_alloc_ioend(struct inode *inode, struct iomap_writepage_ctx *wpc, ioend->io_flags = wpc->iomap.flags; ioend->io_inode = inode; ioend->io_size = 0; - ioend->io_folios = 0; ioend->io_offset = offset; ioend->io_bio = bio; ioend->io_sector = sector; + + wpc->nr_folios = 0; return ioend; } @@ -1722,7 +1723,7 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset, * also prevents long tight loops ending page writeback on all the * folios in the ioend. */ - if (wpc->ioend->io_folios >= IOEND_BATCH_SIZE) + if (wpc->nr_folios >= IOEND_BATCH_SIZE) return false; return true; } @@ -1819,7 +1820,7 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, count++; } if (count) - wpc->ioend->io_folios++; + wpc->nr_folios++; WARN_ON_ONCE(!wpc->ioend && !list_empty(&submit_list)); WARN_ON_ONCE(!folio_test_locked(folio)); |