block: fix deadline elevator drain for zoned block devices

[mirror_ubuntu-bionic-kernel.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index fbe2212761126abe85543f15b7f2286ed65b883c..4dead1ae1270d7fae7b7443d3659b25b99aee3b1 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -640,7 +640,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);