From 0051f908033edcdfaed166a209ea6824802cf039 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 21 May 2025 10:05:50 +0000 Subject: [PATCH] Revert "block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone" This reverts commit 2afa5ea7c48dae11c642f8e7d4479b261c3139dc which is commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I61cd1477ed874611b0d9277be0f67557a41364e4 Signed-off-by: Greg Kroah-Hartman --- block/blk-mq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index e6f1885a9bf0..1875368477df 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3330,7 +3330,6 @@ 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;