diff options
| author | Keith Busch <kbusch@kernel.org> | 2024-09-13 20:28:46 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-09-13 20:31:45 +0200 |
| commit | 2b018086143d638de8d67ae5be6e8c1afb413193 (patch) | |
| tree | d36ac6fb2078ae1a7d1a5281c44a3a67e83f8ad1 /block/blk-mq.c | |
| parent | Merge tag 'nvme-6.12-2024-09-13' of git://git.infradead.org/nvme into for-6.1... (diff) | |
| download | linux-2b018086143d638de8d67ae5be6e8c1afb413193.tar.xz linux-2b018086143d638de8d67ae5be6e8c1afb413193.zip | |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20240913182854.2445457-2-kbusch@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 3f1f7d0b3ff3..ef3a2ed49956 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -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; |