From: Yufen Yu <yuyufen@huawei.com>
Date: Fri, 15 Mar 2019 03:05:10 +0000 (+0800)
Subject: blk-mq: use blk_mq_sched_mark_restart_hctx to set RESTART
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=684b73245cd4d2608f4f2214f6bff02ba6ceca5f;p=openwrt%2Fstaging%2Fblogic.git

blk-mq: use blk_mq_sched_mark_restart_hctx to set RESTART

Let blk_mq_mark_tag_wait() use the blk_mq_sched_mark_restart_hctx()
to set BLK_MQ_S_SCHED_RESTART.

Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index a9c181603cbd..ea01c23b58a3 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1093,8 +1093,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,
 	bool ret;
 
 	if (!(hctx->flags & BLK_MQ_F_TAG_SHARED)) {
-		if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
-			set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
+		blk_mq_sched_mark_restart_hctx(hctx);
 
 		/*
 		 * It's possible that a tag was freed in the window between the