1 files changed, 14 insertions, 40 deletions

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 7fbab84399e6..22d8e9c90189 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -43,33 +43,19 @@ static const char *bi_unsupported_name = "unsupported";
  */
 int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *bio)
 {
-	struct bio_vec iv, ivprv = { NULL };
 	unsigned int segments = 0;
-	unsigned int seg_size = 0;
-	struct bvec_iter iter;
-	int prev = 0;
 
-	bio_for_each_integrity_vec(iv, bio, iter) {
+	for_each_bio(bio) {
+		struct bio_integrity_payload *bip = bio->bi_integrity;
+		struct bvec_iter iter = bip->bip_iter;
 
-		if (prev) {
-			if (!BIOVEC_PHYS_MERGEABLE(&ivprv, &iv))
-				goto new_segment;
+		while (iter.bi_size) {
+			struct bio_vec iv = bvec_iter_bvec(bip->bip_vec, iter);
+			unsigned nbytes = blk_max_segment(q, &iv);
 
-			if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv))
-				goto new_segment;
-
-			if (seg_size + iv.bv_len > queue_max_segment_size(q))
-				goto new_segment;
-
-			seg_size += iv.bv_len;
-		} else {
-new_segment:
 			segments++;
-			seg_size = iv.bv_len;
+			bio_advance_iter(bio, &iter, nbytes);
 		}
-
-		prev = 1;
-		ivprv = iv;
 	}
 
 	return segments;
@@ -89,27 +75,17 @@ EXPORT_SYMBOL(blk_rq_count_integrity_sg);
 int blk_rq_map_integrity_sg(struct request_queue *q, struct bio *bio,
 			    struct scatterlist *sglist)
 {
-	struct bio_vec iv, ivprv = { NULL };
 	struct scatterlist *sg = NULL;
 	unsigned int segments = 0;
-	struct bvec_iter iter;
-	int prev = 0;
 
-	bio_for_each_integrity_vec(iv, bio, iter) {
+	for_each_bio(bio) {
+		struct bio_integrity_payload *bip = bio->bi_integrity;
+		struct bvec_iter iter = bip->bip_iter;
 
-		if (prev) {
-			if (!BIOVEC_PHYS_MERGEABLE(&ivprv, &iv))
-				goto new_segment;
+		while (iter.bi_size) {
+			struct bio_vec iv= bvec_iter_bvec(bip->bip_vec, iter);
+			unsigned nbytes = blk_max_segment(q, &iv);
 
-			if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv))
-				goto new_segment;
-
-			if (sg->length + iv.bv_len > queue_max_segment_size(q))
-				goto new_segment;
-
-			sg->length += iv.bv_len;
-		} else {
-new_segment:
 			if (!sg)
 				sg = sglist;
 			else {
@@ -119,10 +95,8 @@ new_segment:
 
 			sg_set_page(sg, iv.bv_page, iv.bv_len, iv.bv_offset);
 			segments++;
+			bio_advance_iter(bio, &iter, nbytes);
 		}
-
-		prev = 1;
-		ivprv = iv;
 	}
 
 	if (sg)