block: don't look at bip_flags for merges

The two remaining flags are not relevant for merges, so remove the
checks.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 69eed260a823907ad8b9955cf06607a31a52f528..3291f861072d2352097fe7b23967fdb739bc5b00 100644 (file)
--- 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;