From 9d42936e99e21f618ae468e8bdee941f550a56e0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Apr 2022 15:39:57 +0200 Subject: [PATCH] fix up queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch again --- ...ross-cgroup-boundaries-if-blkcg-is-enabled.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 6abbe43c229..3bcb07d3990 100644 --- 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 Signed-off-by: Greg Kroah-Hartman --- - 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 #include #include +#include ++#include #include -@@ -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 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 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; -- 2.47.3