Merge: block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone

caringi · caringi · commit 3f58eed4c62b · 2025-05-06T11:46:14.000-03:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6713 JIRA: https://issues.redhat.com/browse/RHEL-80794 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Ewan D. Milne <emilne@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
diff --git a/block/blk-mq.c b/block/blk-mq.c
@@ -3314,6 +3314,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
 		rq->special_vec = rq_src->special_vec;
 	}
 	rq->nr_phys_segments = rq_src->nr_phys_segments;
+	rq->nr_integrity_segments = rq_src->nr_integrity_segments;
 
 	if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)
 		goto free_and_out;

Original file line number	Diff line number	Diff line change
`@@ -3314,6 +3314,7 @@ int blk_rq_prep_clone(struct request rq, struct request rq_src,`
`3314`	`3314`	`rq->special_vec = rq_src->special_vec;`
`3315`	`3315`	`}`
`3316`	`3316`	`rq->nr_phys_segments = rq_src->nr_phys_segments;`
	`3317`	`+ rq->nr_integrity_segments = rq_src->nr_integrity_segments;`
`3317`	`3318`
`3318`	`3319`	`if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)`
`3319`	`3320`	`goto free_and_out;`