Skip to content

Commit 9183b2a

Browse files
Brian Fosterbrauner
authored andcommitted
iomap: lift error code check out of iomap_iter_advance()
The error code is only used to check whether iomap_iter() should terminate due to an error returned in iter.processed. Lift the check out of iomap_iter_advance() in preparation to make it more generic. Signed-off-by: Brian Foster <bfoster@redhat.com> Link: https://lore.kernel.org/r/20250207143253.314068-5-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>
1 parent f479983 commit 9183b2a

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

fs/iomap/iter.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ static inline int iomap_iter_advance(struct iomap_iter *iter, s64 count)
3030
bool stale = iter->iomap.flags & IOMAP_F_STALE;
3131
int ret = 1;
3232

33-
if (count < 0)
34-
return count;
3533
if (WARN_ON_ONCE(count > iomap_length(iter)))
3634
return -EIO;
3735
iter->pos += count;
@@ -71,6 +69,7 @@ static inline void iomap_iter_done(struct iomap_iter *iter)
7169
*/
7270
int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops)
7371
{
72+
s64 processed;
7473
int ret;
7574

7675
trace_iomap_iter(iter, ops, _RET_IP_);
@@ -86,8 +85,14 @@ int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops)
8685
return ret;
8786
}
8887

88+
processed = iter->processed;
89+
if (processed < 0) {
90+
iomap_iter_reset_iomap(iter);
91+
return processed;
92+
}
93+
8994
/* advance and clear state from the previous iteration */
90-
ret = iomap_iter_advance(iter, iter->processed);
95+
ret = iomap_iter_advance(iter, processed);
9196
iomap_iter_reset_iomap(iter);
9297
if (ret <= 0)
9398
return ret;

0 commit comments

Comments
 (0)