Re: [PATCH 14/22] iomap: add a IOMAP_IOEND_INTEGRITY flag

On Thu, Jul 23, 2026 at 04:49:39PM +0200, Christoph Hellwig wrote:
> This will make it easier to share code for the various submit callback
> provided by the file system to iomap.
> 
> Signed-off-by: Christoph Hellwig <[email protected]>

This also looks pretty straightforward, so
Reviewed-by: "Darrick J. Wong" <[email protected]>

--D

> ---
>  fs/iomap/ioend.c      |  2 +-
>  fs/xfs/xfs_aops.c     |  3 ++-
>  fs/xfs/xfs_file.c     |  5 +++--
>  include/linux/iomap.h | 11 ++++++++++-
>  4 files changed, 16 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/iomap/ioend.c b/fs/iomap/ioend.c
> index b1bca36de430..438be92e131b 100644
> --- a/fs/iomap/ioend.c
> +++ b/fs/iomap/ioend.c
> @@ -150,7 +150,7 @@ int iomap_ioend_writeback_submit(struct iomap_writepage_ctx *wpc, int error)
>  		return error;
>  	}
>  
> -	if (wpc->iomap.flags & IOMAP_F_INTEGRITY)
> +	if (ioend->io_flags & IOMAP_IOEND_INTEGRITY)
>  		fs_bio_integrity_generate(&ioend->io_bio);
>  	submit_bio(&ioend->io_bio);
>  	return 0;
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 51293b6f331f..b95d74e40b06 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -763,7 +763,8 @@ xfs_bio_submit_read(
>  	struct bio			*bio = ctx->read_ctx;
>  
>  	/* defer read completions to the ioend workqueue */
> -	iomap_init_ioend(iter->inode, bio, ctx->read_ctx_file_offset, 0);
> +	iomap_init_ioend(iter->inode, bio, ctx->read_ctx_file_offset,
> +		iomap_ioend_flags(&iter->iomap));
>  	iomap_bio_submit_read_endio(iter, ctx, xfs_end_bio);
>  }
>  
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 845a97c9b063..e94a26f32e65 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -235,7 +235,8 @@ xfs_dio_read_bounce_submit_io(
>  	struct bio		*bio,
>  	loff_t			file_offset)
>  {
> -	iomap_init_ioend(iter->inode, bio, file_offset, IOMAP_IOEND_DIRECT);
> +	iomap_init_ioend(iter->inode, bio, file_offset,
> +		iomap_ioend_flags(&iter->iomap) | IOMAP_IOEND_DIRECT);
>  	bio->bi_end_io = xfs_end_bio;
>  	submit_bio(bio);
>  }
> @@ -724,7 +725,7 @@ xfs_dio_zoned_submit_io(
>  
>  	bio->bi_end_io = xfs_end_bio;
>  	ioend = iomap_init_ioend(iter->inode, bio, file_offset,
> -			IOMAP_IOEND_DIRECT);
> +		iomap_ioend_flags(&iter->iomap) | IOMAP_IOEND_DIRECT);
>  	xfs_zone_alloc_and_submit(ioend, &ac->open_zone);
>  }
>  
> diff --git a/include/linux/iomap.h b/include/linux/iomap.h
> index 2541ebfabca0..1916a4f28002 100644
> --- a/include/linux/iomap.h
> +++ b/include/linux/iomap.h
> @@ -406,6 +406,12 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno,
>  #define IOMAP_IOEND_DIRECT		(1U << 3)
>  /* is DONTCACHE I/O */
>  #define IOMAP_IOEND_DONTCACHE		(1U << 4)
> +/* generate integrity (PI) information */
> +#ifdef CONFIG_BLK_DEV_INTEGRITY
> +#define IOMAP_IOEND_INTEGRITY		(1U << 5)
> +#else
> +#define IOMAP_IOEND_INTEGRITY		0
> +#endif /* CONFIG_BLK_DEV_INTEGRITY */
>  
>  /*
>   * Flags that if set on either ioend prevent the merge of two ioends.
> @@ -413,7 +419,7 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno,
>   */
>  #define IOMAP_IOEND_NOMERGE_FLAGS \
>  	(IOMAP_IOEND_SHARED | IOMAP_IOEND_UNWRITTEN | IOMAP_IOEND_DIRECT | \
> -	 IOMAP_IOEND_DONTCACHE)
> +	 IOMAP_IOEND_DONTCACHE | IOMAP_IOEND_INTEGRITY)
>  
>  /* ioend flags directly implied by iomap flags */
>  static inline u16 iomap_ioend_flags(const struct iomap *iomap)
> @@ -424,6 +430,9 @@ static inline u16 iomap_ioend_flags(const struct iomap *iomap)
>  		flags |= IOMAP_IOEND_UNWRITTEN;
>  	if (iomap->flags & IOMAP_F_SHARED)
>  		flags |= IOMAP_IOEND_SHARED;
> +	if (iomap->flags & IOMAP_F_INTEGRITY)
> +		flags |= IOMAP_IOEND_INTEGRITY;
> +
>  	return flags;
>  }
>  
> -- 
> 2.53.0
> 
>