X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=block%2Fblk-core.c;h=6b2ca92ff39de641c9fe3a09ce066af3ee305ef8;hb=1bf7f1c641c7c83b9ed9099c5da4e6011e1664e2;hp=e7dde068580aef3c4705db577dc91b6852c78773;hpb=6680c082386abdfa6d04272ec1e839e625a8c187;p=mirror_ubuntu-bionic-kernel.git

diff --git a/block/blk-core.c b/block/blk-core.c
index e7dde068580a..6b2ca92ff39d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -884,6 +884,10 @@ static void blk_rq_timed_out_timer(struct timer_list *t)
 	kblockd_schedule_work(&q->timeout_work);
 }
 
+static void blk_timeout_work_dummy(struct work_struct *work)
+{
+}
+
 struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 {
 	struct request_queue *q;
@@ -918,7 +922,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 	timer_setup(&q->backing_dev_info->laptop_mode_wb_timer,
 		    laptop_mode_timer_fn, 0);
 	timer_setup(&q->timeout, blk_rq_timed_out_timer, 0);
-	INIT_WORK(&q->timeout_work, NULL);
+	INIT_WORK(&q->timeout_work, blk_timeout_work_dummy);
 	INIT_LIST_HEAD(&q->queue_head);
 	INIT_LIST_HEAD(&q->timeout_list);
 	INIT_LIST_HEAD(&q->icq_list);