Re: [PATCH 05/15] block: make max_integrity_io_size public

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Jan 21, 2026 at 07:43:13AM +0100, Christoph Hellwig wrote:
> File systems that generate integrity will need this, so move it out
> of the block private or blk-mq specific headers.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Seems reasonable to me given what I saw in the rest of the patchset...
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  block/blk-settings.c          | 13 -------------
>  include/linux/blk-integrity.h |  5 -----
>  include/linux/blkdev.h        | 18 ++++++++++++++++++
>  3 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index a9e65dc090da..dabfab97fbab 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -123,19 +123,6 @@ static int blk_validate_zoned_limits(struct queue_limits *lim)
>  	return 0;
>  }
>  
> -/*
> - * Maximum size of I/O that needs a block layer integrity buffer.  Limited
> - * by the number of intervals for which we can fit the integrity buffer into
> - * the buffer size.  Because the buffer is a single segment it is also limited
> - * by the maximum segment size.
> - */
> -static inline unsigned int max_integrity_io_size(struct queue_limits *lim)
> -{
> -	return min_t(unsigned int, lim->max_segment_size,
> -		(BLK_INTEGRITY_MAX_SIZE / lim->integrity.metadata_size) <<
> -			lim->integrity.interval_exp);
> -}
> -
>  static int blk_validate_integrity_limits(struct queue_limits *lim)
>  {
>  	struct blk_integrity *bi = &lim->integrity;
> diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h
> index 91d12610d252..b2f34f696a4f 100644
> --- a/include/linux/blk-integrity.h
> +++ b/include/linux/blk-integrity.h
> @@ -8,11 +8,6 @@
>  
>  struct request;
>  
> -/*
> - * Maximum contiguous integrity buffer allocation.
> - */
> -#define BLK_INTEGRITY_MAX_SIZE		SZ_2M
> -
>  enum blk_integrity_flags {
>  	BLK_INTEGRITY_NOVERIFY		= 1 << 0,
>  	BLK_INTEGRITY_NOGENERATE	= 1 << 1,
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index c1f3e6bcc217..8d4e622c1f98 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1875,6 +1875,24 @@ static inline int bio_split_rw_at(struct bio *bio,
>  	return bio_split_io_at(bio, lim, segs, max_bytes, lim->dma_alignment);
>  }
>  
> +/*
> + * Maximum contiguous integrity buffer allocation.
> + */
> +#define BLK_INTEGRITY_MAX_SIZE		SZ_2M
> +
> +/*
> + * Maximum size of I/O that needs a block layer integrity buffer.  Limited
> + * by the number of intervals for which we can fit the integrity buffer into
> + * the buffer size.  Because the buffer is a single segment it is also limited
> + * by the maximum segment size.
> + */
> +static inline unsigned int max_integrity_io_size(struct queue_limits *lim)
> +{
> +	return min_t(unsigned int, lim->max_segment_size,
> +		(BLK_INTEGRITY_MAX_SIZE / lim->integrity.metadata_size) <<
> +			lim->integrity.interval_exp);
> +}
> +
>  #define DEFINE_IO_COMP_BATCH(name)	struct io_comp_batch name = { }
>  
>  #endif /* _LINUX_BLKDEV_H */
> -- 
> 2.47.3
> 
>