fix up queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled...

diff --git a/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch b/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
index 6abbe43c229e41a09bbad13260f739d5cc71061e..3bcb07d39903fb92a9c70603f069fdaee2ab5a7e 100644 (file)
--- a/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
+++ b/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
@@ -25,21 +25,22 @@ Link: https://lore.kernel.org/r/Yi/eE/6zFNyWJ+qd@slm.duckdns.org
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- block/blk-merge.c          |   11 +++++++++++
+ block/blk-merge.c          |   12 ++++++++++++
  include/linux/blk-cgroup.h |   17 +++++++++++++++++
- 2 files changed, 28 insertions(+)
+ 2 files changed, 29 insertions(+)
 
 --- a/block/blk-merge.c
 +++ b/block/blk-merge.c
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,8 @@
  #include <linux/bio.h>
  #include <linux/blkdev.h>
  #include <linux/scatterlist.h>
 +#include <linux/blkdev.h>
++#include <linux/blk-cgroup.h>
  
  #include <trace/events/block.h>
  
-@@ -486,6 +487,9 @@ static inline int ll_new_hw_segment(stru
+@@ -486,6 +488,9 @@ static inline int ll_new_hw_segment(stru
        if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q))
                goto no_merge;
  
@@ -49,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (blk_integrity_merge_bio(q, req, bio) == false)
                goto no_merge;
  
-@@ -609,6 +613,9 @@ static int ll_merge_requests_fn(struct r
+@@ -609,6 +614,9 @@ static int ll_merge_requests_fn(struct r
        if (total_phys_segments > queue_max_segments(q))
                return 0;
  
@@ -59,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (blk_integrity_merge_rq(q, req, next) == false)
                return 0;
  
-@@ -843,6 +850,10 @@ bool blk_rq_merge_ok(struct request *rq,
+@@ -843,6 +851,10 @@ bool blk_rq_merge_ok(struct request *rq,
        if (rq->rq_disk != bio->bi_disk || req_no_special_merge(rq))
                return false;