Skip to contentSkip to conversation

FAILED: patch "[PATCH] dm: fix second blk_delay_queue() parameter to be in msec" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Aug 18, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From bd9f55ea1cf6e14eb054b06ea877d2d1fa339514 Mon Sep 17 00:00:00 2001

From: Tahsin Erdogan <[email protected]>
Date: Fri, 15 Jul 2016 06:27:08 -0700
Subject: [PATCH] dm: fix second blk_delay_queue() parameter to be in msec
units not jiffies

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.

Fixes d548b34b062 ("dm: reduce the queue delay used in dm_request_fn from 100ms to 10ms")
Cc [email protected] # 4.1+ -- stable@ backports must be applied to drivers/md/dm.c
drivers/md/dm-rq.c +1 -1
index aa81539374a6..7a9661868496 100644
@@ -785,7 +785,7 @@ static void dm_old_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;
 		}