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>
Sun, 10 May 2020 08:26:25 +0000 (10:26 +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")
Cc: stable@vger.kernel.org # 4.1+ -- stable@ backports must be applied to drivers/md/dm.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/dm.c

index c4d4cd38a58fa325f059ad3e851223f8251d892d..ff017d148323d54f91be106d04e36aa5b66ad0eb 100644 (file)
@@ -2192,7 +2192,7 @@ static void dm_request_fn(struct request_queue *q)
        goto out;
 
 delay_and_out:
-       blk_delay_queue(q, HZ / 100);
+       blk_delay_queue(q, 10);
 out:
        dm_put_live_table(md, srcu_idx);
 }