]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
dm: fix second blk_delay_queue() parameter to be in msec units not jiffies
authorSasha Levin <alexander.levin@verizon.com>
Sun, 14 Aug 2016 22:50:25 +0000 (18:50 -0400)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:07 +0000 (17:22 -0500)
Orabug: 25308125

[ Upstream commit bd9f55ea1cf6e14eb054b06ea877d2d1fa339514 ]

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: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit abf9569225763ab83a538530454f7d280fd08e4a)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/md/dm.c

index 1f37781f7765dfddf91bf3e9fca3c908c46ac35a..848d85339271e815a8edb4d12b400f4a5c7458c3 100644 (file)
@@ -2139,7 +2139,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);
 }