diff options
| author |   Brian Foster <bfoster@redhat.com> | 2025-02-07 09:32:52 -0500 |
|---|---|---|
| committer |   Christian Brauner <brauner@kernel.org> | 2025-02-10 12:46:34 +0100 |
| commit | e60837da4d9daa8abadd9fafd9b1941fa1dba037 (patch) | |
| tree | c8acaafac2e686dcf3ab1a7b0f61b4e42de608b4 | |
| parent | iomap: advance the iter directly on buffered writes (diff) | |
| download | wireguard-linux-e60837da4d9daa8abadd9fafd9b1941fa1dba037.tar.xz wireguard-linux-e60837da4d9daa8abadd9fafd9b1941fa1dba037.zip | |
iomap: advance the iter directly on unshare range
Modify unshare range to advance the iter directly. Replace the local
pos and length calculations with direct advances and loop based on
iter state instead.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Link: https://lore.kernel.org/r/20250207143253.314068-10-bfoster@redhat.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/iomap/buffered-io.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 93a7e8bdd15b..61e541f0364a 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1263,20 +1263,19 @@ EXPORT_SYMBOL_GPL(iomap_write_delalloc_release); static loff_t iomap_unshare_iter(struct iomap_iter *iter) { struct iomap *iomap = &iter->iomap; - loff_t pos = iter->pos; - loff_t length = iomap_length(iter); - loff_t written = 0; + u64 bytes = iomap_length(iter); + int status; if (!iomap_want_unshare_iter(iter)) - return length; + return iomap_iter_advance(iter, &bytes); do { struct folio *folio; - int status; size_t offset; - size_t bytes = min_t(u64, SIZE_MAX, length); + loff_t pos = iter->pos; bool ret; + bytes = min_t(u64, SIZE_MAX, bytes); status = iomap_write_begin(iter, pos, bytes, &folio); if (unlikely(status)) return status; @@ -1294,14 +1293,14 @@ static loff_t iomap_unshare_iter(struct iomap_iter *iter) cond_resched(); - pos += bytes; - written += bytes; - length -= bytes; - balance_dirty_pages_ratelimited(iter->inode->i_mapping); - } while (length > 0); - return written; + status = iomap_iter_advance(iter, &bytes); + if (status) + break; + } while (bytes > 0); + + return status; } int |