Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 25 insertions, 13 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index eafc94f68d79..cfcc37cb222b 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -21,7 +21,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
                 return 0;
 
         fbio = bio;
-        cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
+        cluster = blk_queue_cluster(q);
         seg_size = 0;
         nr_phys_segs = 0;
         for_each_bio(bio) {
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(blk_recount_segments);
 static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
                                    struct bio *nxt)
 {
-        if (!test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags))
+        if (!blk_queue_cluster(q))
                 return 0;
 
         if (bio->bi_seg_back_size + nxt->bi_seg_front_size >
@@ -123,7 +123,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
         int nsegs, cluster;
 
         nsegs = 0;
-        cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
+        cluster = blk_queue_cluster(q);
 
         /*
          * for each bio in rq
@@ -205,12 +205,11 @@ static inline int ll_new_hw_segment(struct request_queue *q,
 {
         int nr_phys_segs = bio_phys_segments(q, bio);
 
-        if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q)) {
-                req->cmd_flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
+        if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q))
+                goto no_merge;
+
+        if (bio_integrity(bio) && blk_integrity_merge_bio(q, req, bio))
+                goto no_merge;
 
         /*
          * This will form the start of a new hw segment.  Bump both
@@ -218,6 +217,12 @@ static inline int ll_new_hw_segment(struct request_queue *q,
          */
         req->nr_phys_segments += nr_phys_segs;
         return 1;
+
+no_merge:
+        req->cmd_flags |= REQ_NOMERGE;
+        if (req == q->last_merge)
+                q->last_merge = NULL;
+        return 0;
 }
 
 int ll_back_merge_fn(struct request_queue *q, struct request *req,
@@ -301,6 +306,9 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,
         if (total_phys_segments > queue_max_segments(q))
                 return 0;
 
+        if (blk_integrity_rq(req) && blk_integrity_merge_rq(q, req, next))
+                return 0;
+
         /* Merge is OK... */
         req->nr_phys_segments = total_phys_segments;
         return 1;
@@ -343,11 +351,12 @@ static void blk_account_io_merge(struct request *req)
                 int cpu;
 
                 cpu = part_stat_lock();
-                part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
+                part = req->part;
 
                 part_round_stats(cpu, part);
                 part_dec_in_flight(part, rq_data_dir(req));
 
+                hd_struct_put(part);
                 part_stat_unlock();
         }
 }
@@ -384,9 +393,6 @@ static int attempt_merge(struct request_queue *q, struct request *req,
             || next->special)
                 return 0;
 
-        if (blk_integrity_rq(req) != blk_integrity_rq(next))
-                return 0;
-
         /*
          * If we are allowed to merge, then append bio list
          * from next to rq and release next. merge_requests_fn
@@ -459,3 +465,9 @@ int attempt_front_merge(struct request_queue *q, struct request *rq)
 
         return 0;
 }
+
+int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
+                          struct request *next)
+{
+        return attempt_merge(q, rq, next);
+}