diff options
| author | Keith Busch <kbusch@kernel.org> | 2024-09-13 11:28:47 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-09-13 12:31:45 -0600 |
| commit | 9c297eced59817f461be33e4c241820c5be4bcc1 (patch) | |
| tree | 4c5669b8b699818cf9b191a1472908edd891e6ea /block | |
| parent | 2b018086143d638de8d67ae5be6e8c1afb413193 (diff) | |
| download | linux-stable-9c297eced59817f461be33e4c241820c5be4bcc1.tar.gz linux-stable-9c297eced59817f461be33e4c241820c5be4bcc1.tar.bz2 linux-stable-9c297eced59817f461be33e4c241820c5be4bcc1.zip | |
blk-mq: set the nr_integrity_segments from bio
This value is used for merging considerations, so it needs to be
accurate.
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-3-kbusch@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index ef3a2ed49956..82219f0e9a25 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2544,6 +2544,9 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio, rq->__sector = bio->bi_iter.bi_sector; rq->write_hint = bio->bi_write_hint; blk_rq_bio_prep(rq, bio, nr_segs); + if (bio_integrity(bio)) + rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q, + bio); /* This can't fail, since GFP_NOIO includes __GFP_DIRECT_RECLAIM. */ err = blk_crypto_rq_bio_prep(rq, bio, GFP_NOIO); |