Skip to contentSkip to conversation

FAILED: patch "[PATCH] block: Make blk_mq_delay_kick_requeue_list() rerun the queue" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Aug 14, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-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 d4acf3650c7c968f46ad932b9a25d1cc24cf4998 Mon Sep 17 00:00:00 2001

From: Bart Van Assche <[email protected]>
Date: Wed, 9 Aug 2017 11:28:06 -0700
Subject: [PATCH] block: Make blk_mq_delay_kick_requeue_list() rerun the queue
at a quiet time

The blk_mq_delay_kick_requeue_list() function is used by the device mapper and only by the device mapper to rerun the queue and requeue list after a delay. This function is called once per request that gets requeued. Modify this function such that the queue is run once per path change event instead of once per request that is requeued.

Fixes commit 2849450ad39d ("blk-mq: introduce blk_mq_delay_kick_requeue_list()")
Cc Mike Snitzer <[email protected]>
Cc Laurence Oberman <[email protected]>
block/blk-mq.c +2 -2
index 211ef367345f..535cbdf32aab 100644
@@ -684,8 +684,8 @@ EXPORT_SYMBOL(blk_mq_kick_requeue_list);
 void blk_mq_delay_kick_requeue_list(struct request_queue *q,
 				    unsigned long msecs)
 {
-	kblockd_schedule_delayed_work(&q->requeue_work,
-				      msecs_to_jiffies(msecs));
+	kblockd_mod_delayed_work_on(WORK_CPU_UNBOUND, &q->requeue_work,
+				    msecs_to_jiffies(msecs));
 }
 EXPORT_SYMBOL(blk_mq_delay_kick_requeue_list);