Re: [PATCH 13/22] iomap: add a iomap_ioend_flags helper
"Darrick J. Wong" <[email protected]>
| Newsgroups | org.kernel.vger.linux-xfs,org.kernel.vger.linux-block,org.kernel.vger.linux-fsdevel |
|---|---|
| Message-ID | <20260723205257.GC2901224@frogsfrogsfrogs> |
On Thu, Jul 23, 2026 at 04:49:38PM +0200, Christoph Hellwig wrote: > Add a helper to initialize the ioend flags to the values that can be > directly derived from the iomap. > > Signed-off-by: Christoph Hellwig <[email protected]> Pretty straightforward hoist, Reviewed-by: "Darrick J. Wong" <[email protected]> --D > --- > fs/iomap/ioend.c | 10 +++------- > include/linux/iomap.h | 12 ++++++++++++ > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/fs/iomap/ioend.c b/fs/iomap/ioend.c > index 34f71c8b5ebd..b1bca36de430 100644 > --- a/fs/iomap/ioend.c > +++ b/fs/iomap/ioend.c > @@ -216,7 +216,7 @@ ssize_t iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, struct folio *folio, > { > struct iomap_ioend *ioend = wpc->wb_ctx; > size_t poff = offset_in_folio(folio, pos); > - unsigned int ioend_flags = 0; > + unsigned int ioend_flags = iomap_ioend_flags(&wpc->iomap); > unsigned int map_len = min_t(u64, dirty_len, > wpc->iomap.offset + wpc->iomap.length - pos); > int error; > @@ -226,20 +226,16 @@ ssize_t iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, struct folio *folio, > WARN_ON_ONCE(!folio->private && map_len < dirty_len); > > switch (wpc->iomap.type) { > + case IOMAP_HOLE: > + return map_len; > case IOMAP_UNWRITTEN: > - ioend_flags |= IOMAP_IOEND_UNWRITTEN; > - break; > case IOMAP_MAPPED: > break; > - case IOMAP_HOLE: > - return map_len; > default: > WARN_ON_ONCE(1); > return -EIO; > } > > - if (wpc->iomap.flags & IOMAP_F_SHARED) > - ioend_flags |= IOMAP_IOEND_SHARED; > if (folio_test_dropbehind(folio)) > ioend_flags |= IOMAP_IOEND_DONTCACHE; > if (pos == wpc->iomap.offset && (wpc->iomap.flags & IOMAP_F_BOUNDARY)) > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index ff9afdd39682..2541ebfabca0 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -415,6 +415,18 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno, > (IOMAP_IOEND_SHARED | IOMAP_IOEND_UNWRITTEN | IOMAP_IOEND_DIRECT | \ > IOMAP_IOEND_DONTCACHE) > > +/* ioend flags directly implied by iomap flags */ > +static inline u16 iomap_ioend_flags(const struct iomap *iomap) > +{ > + unsigned int flags = 0; > + > + if (iomap->type == IOMAP_UNWRITTEN) > + flags |= IOMAP_IOEND_UNWRITTEN; > + if (iomap->flags & IOMAP_F_SHARED) > + flags |= IOMAP_IOEND_SHARED; > + return flags; > +} > + > /* > * Structure for writeback I/O completions. > * > -- > 2.53.0 > >