From: Christoph Hellwig Date: Sun, 6 Jun 2021 12:06:33 +0000 (+0200) Subject: block: don't look at bip_flags for merges X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=51301e7c1516923daecd94d937e9640bde2eb607;p=users%2Fhch%2Fblock.git block: don't look at bip_flags for merges The two remaining flags are in no way in the way of merges, so remove the checks. Signed-off-by: Christoph Hellwig --- diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 410da060d1f5..a98af6fb3795 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -170,10 +170,6 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req, if (blk_integrity_rq(req) == 0 || blk_integrity_rq(next) == 0) return false; - if (bio_integrity(req->bio)->bip_flags != - bio_integrity(next->bio)->bip_flags) - return false; - if (req->nr_integrity_segments + next->nr_integrity_segments > q->limits.max_integrity_segments) return false; @@ -196,9 +192,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req, if (blk_integrity_rq(req) == 0 || bio_integrity(bio) == NULL) return false; - if (bio_integrity(req->bio)->bip_flags != bio_integrity(bio)->bip_flags) - return false; - bio->bi_next = NULL; nr_integrity_segs = blk_rq_count_integrity_sg(q, bio); bio->bi_next = next;