summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-23 15:32:59 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-23 15:32:59 -0400
commit1c845d45ea97c2411eb7bf2318618a67cef08f88 (patch)
tree0a87ccbd95d88894fa026e56002d1f23f266b502
parent4757ae22de6d283906eaa031ba3b816c7de61b00 (diff)
downloadlongterm-queue-4.12-1c845d45ea97c2411eb7bf2318618a67cef08f88.tar.gz
blk: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch b/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
index 55ef133..6e79924 100644
--- a/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
+++ b/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
@@ -1,4 +1,4 @@
-From 5e3d02bbafad38975099b5848f5ebadedcf7bb7e Mon Sep 17 00:00:00 2001
+From 2e07e9060fe5ebb526fa9d73e9d8a29925c15f46 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@redhat.com>
Date: Sat, 14 Oct 2017 17:22:25 +0800
Subject: [PATCH] blk-mq-sched: dispatch from scheduler IFF progress is made in
@@ -18,12 +18,13 @@ Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
-index 4ab69435708c..eca011fdfa0e 100644
+index 0ded5e846335..d654f3807822 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
-@@ -94,7 +94,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
+@@ -177,7 +177,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
struct request_queue *q = hctx->queue;
struct elevator_queue *e = q->elevator;
const bool has_sched_dispatch = e && e->type->ops.mq.dispatch_request;
@@ -31,8 +32,8 @@ index 4ab69435708c..eca011fdfa0e 100644
+ bool do_sched_dispatch = true;
LIST_HEAD(rq_list);
- /* RCU or SRCU read lock is needed before checking quiesced flag */
-@@ -125,18 +125,18 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
+ if (unlikely(blk_mq_hctx_stopped(hctx)))
+@@ -207,18 +207,18 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
*/
if (!list_empty(&rq_list)) {
blk_mq_sched_mark_restart_hctx(hctx);