block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone

jira LE-3460
Rebuild_History Non-Buildable kernel-6.12.0-55.18.1.el10_0
commit-author Ming Lei <[email protected]>
commit fc0e982
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-6.12.0-55.18.1.el10_0/fc0e982b.failed

Make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone(),
otherwise requests cloned by device-mapper multipath will not have the
proper nr_integrity_segments values set, then BUG() is hit from
sg_alloc_table_chained().

Fixes: b0fd271 ("block: add request clone interface (v2)")
	Cc: [email protected]
	Cc: Christoph Hellwig <[email protected]>
	Signed-off-by: Ming Lei <[email protected]>
	Reviewed-by: Christoph Hellwig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Jens Axboe <[email protected]>
(cherry picked from commit fc0e982)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	block/blk-mq.c

Author: PlaidCat

ciq/ciq_backports/kernel-6.12.0-55.18.1.el10_0/fc0e982b.failed

@@ -0,0 +1,45 @@
+block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone
+
+jira LE-3460
+Rebuild_History Non-Buildable kernel-6.12.0-55.18.1.el10_0
+commit-author Ming Lei <[email protected]>
+commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-6.12.0-55.18.1.el10_0/fc0e982b.failed
+
+Make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone(),
+otherwise requests cloned by device-mapper multipath will not have the
+proper nr_integrity_segments values set, then BUG() is hit from
+sg_alloc_table_chained().
+
+Fixes: b0fd271d5fba ("block: add request clone interface (v2)")
+	Cc: [email protected]
+	Cc: Christoph Hellwig <[email protected]>
+	Signed-off-by: Ming Lei <[email protected]>
+	Reviewed-by: Christoph Hellwig <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+	Signed-off-by: Jens Axboe <[email protected]>
+(cherry picked from commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	block/blk-mq.c
+diff --cc block/blk-mq.c
+index cf626e061dd7,f1030d589a1b..000000000000
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@@ -3187,8 -3314,7 +3187,12 @@@ int blk_rq_prep_clone(struct request *r
+  		rq->special_vec = rq_src->special_vec;
+  	}
+  	rq->nr_phys_segments = rq_src->nr_phys_segments;
+++<<<<<<< HEAD
+ +	rq->ioprio = rq_src->ioprio;
+ +	rq->write_hint = rq_src->write_hint;
+++=======
++ 	rq->nr_integrity_segments = rq_src->nr_integrity_segments;
+++>>>>>>> fc0e982b8a3a (block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone)
+  
+  	if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)
+  		goto free_and_out;
+* Unmerged path block/blk-mq.c