summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2018-09-27 10:55:13 +0900
committerJens Axboe <axboe@kernel.dk>2018-09-26 19:57:24 -0600
commit854f31ccdd7964c9c2e68da234a3a8aedb51cf6b (patch)
treebd335dac4d4722bbe1c09cb76290b50da254fd8b /block
parent530ca2c9bd6949c72c9b5cfc330cb3dbccaa3f5b (diff)
downloadlinux-stable-854f31ccdd7964c9c2e68da234a3a8aedb51cf6b.tar.gz
linux-stable-854f31ccdd7964c9c2e68da234a3a8aedb51cf6b.tar.bz2
linux-stable-854f31ccdd7964c9c2e68da234a3a8aedb51cf6b.zip
block: fix deadline elevator drain for zoned block devices
When the deadline scheduler is used with a zoned block device, writes to a zone will be dispatched one at a time. This causes the warning message: deadline: forced dispatching is broken (nr_sorted=X), please report this to be displayed when switching to another elevator with the legacy I/O path while write requests to a zone are being retained in the scheduler queue. Prevent this message from being displayed when executing elv_drain_elevator() for a zoned block device. __blk_drain_queue() will loop until all writes are dispatched and completed, resulting in the desired elevator queue drain without extensive modifications to the deadline code itself to handle forced-dispatch calls. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Fixes: 8dc8146f9c92 ("deadline-iosched: Introduce zone locking support") Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 6a06b5d040e5..fae58b2f906f 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -609,7 +609,7 @@ void elv_drain_elevator(struct request_queue *q)
while (e->type->ops.sq.elevator_dispatch_fn(q, 1))
;
- if (q->nr_sorted && printed++ < 10) {
+ if (q->nr_sorted && !blk_queue_is_zoned(q) && printed++ < 10 ) {
printk(KERN_ERR "%s: forced dispatching is broken "
"(nr_sorted=%u), please report this\n",
q->elevator->type->elevator_name, q->nr_sorted);