]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dm: fix second blk_delay_queue() parameter to be in msec units not jiffies
authorTahsin Erdogan <tahsin@google.com>
Fri, 15 Jul 2016 13:27:08 +0000 (06:27 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Aug 2016 16:10:52 +0000 (18:10 +0200)
commit bd9f55ea1cf6e14eb054b06ea877d2d1fa339514 upstream.

Commit d548b34b062 ("dm: reduce the queue delay used in dm_request_fn
from 100ms to 10ms") always intended the value to be 10 msecs -- it
just expressed it in jiffies because earlier commit 7eaceaccab ("block:
remove per-queue plugging") did.

Signed-off-by: Tahsin Erdogan <tahsin@google.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Fixes: d548b34b062 ("dm: reduce the queue delay used in dm_request_fn from 100ms to 10ms")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/dm.c

index 1b2f96205361e28d3332fe3b71dbd5947cb4b9c8..17c63265a2057aeb7dec39578e13439decf531f7 100644 (file)
@@ -2175,7 +2175,7 @@ static void dm_request_fn(struct request_queue *q)
                     md_in_flight(md) && rq->bio && rq->bio->bi_vcnt == 1 &&
                     md->last_rq_pos == pos && md->last_rq_rw == rq_data_dir(rq)) ||
                    (ti->type->busy && ti->type->busy(ti))) {
-                       blk_delay_queue(q, HZ / 100);
+                       blk_delay_queue(q, 10);
                        return;
                }