Commit 2b018086 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

blk-mq: unconditional nr_integrity_segments 



Always defining the field will make using it easier and less error prone
in future patches.

There shouldn't be any downside to this: the field fits in what would
otherwise be a 2-byte hole, so we're not saving space by conditionally
leaving it out.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20240913182854.2445457-2-kbusch@meta.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d4d7c03f

block/blk-mq.c

+0 −2
Original line number Diff line number Diff line
@@ -376,9 +376,7 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
	rq->io_start_time_ns = 0;

	rq->stats_sectors = 0;

	rq->nr_phys_segments = 0;

#if defined(CONFIG_BLK_DEV_INTEGRITY)

	rq->nr_integrity_segments = 0;

#endif

	rq->end_io = NULL;

	rq->end_io_data = NULL;

include/linux/blk-mq.h

+0 −3
Original line number Diff line number Diff line
@@ -149,10 +149,7 @@ struct request { 
	 * physical address coalescing is performed.

	 */

	unsigned short nr_phys_segments;



#ifdef CONFIG_BLK_DEV_INTEGRITY

	unsigned short nr_integrity_segments;

#endif



#ifdef CONFIG_BLK_INLINE_ENCRYPTION

	struct bio_crypt_ctx *crypt_ctx;