Commit 8c56ef10 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: make max_integrity_io_size public 



File systems that generate integrity will need this, so move it out
of the block private or blk-mq specific headers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Tested-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3f006268

block/blk-settings.c

+0 −13
Original line number Diff line number Diff line
@@ -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;

include/linux/blk-integrity.h

+0 −5
Original line number Diff line number Diff line
@@ -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,

include/linux/blkdev.h

+18 −0
Original line number Diff line number Diff line
@@ -1881,6 +1881,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 */