From: Jianchao Wang <jianchao.w.wang@oracle.com>
To: axboe@kernel.dk, hch@lst.de, martin.petersen@oracle.com,
keith.busch@intel.com, josef@toxicpanda.com,
ulf.hansson@linaro.org
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] mmc: use __blk_mq_complete_request in timeout path
Date: Wed, 20 Jun 2018 21:22:43 +0800 [thread overview]
Message-ID: <1529500964-28429-5-git-send-email-jianchao.w.wang@oracle.com> (raw)
In-Reply-To: <1529500964-28429-1-git-send-email-jianchao.w.wang@oracle.com>
To regain the capability to prevent normal completion path from
entering a timeout request, blk_mq_mark_rq_complete is introduced
in blk_mq_complete_request. Have to use __blk_mq_complete_request
in timeout path to complete a timeout request.
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
---
drivers/mmc/core/queue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 648eb67..43dcd7a 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -112,7 +112,7 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
return BLK_EH_RESET_TIMER;
}
/* No timeout (XXX: huh? comment doesn't make much sense) */
- blk_mq_complete_request(req);
+ __blk_mq_complete_request(req);
return BLK_EH_DONE;
default:
/* Timeout is handled by mmc core */
--
2.7.4
next prev parent reply other threads:[~2018-06-20 13:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 13:22 [PATCH 0/5]stop normal completion path entering a timeout req Jianchao Wang
2018-06-20 13:22 ` [PATCH 1/5] blk-mq: prevent normal completion from entering a timeout request Jianchao Wang
2018-06-20 13:22 ` [PATCH 2/5] nbd: use __blk_mq_complete_request in timeout path Jianchao Wang
2018-06-20 14:13 ` Josef Bacik
2018-06-20 13:22 ` [PATCH 3/5] null_blk: " Jianchao Wang
2018-06-20 13:22 ` Jianchao Wang [this message]
2018-06-20 13:22 ` [PATCH 5/5] nvme: " Jianchao Wang
2018-06-20 14:39 ` Christoph Hellwig
2018-06-21 2:09 ` jianchao.wang
2018-06-24 18:07 ` Sagi Grimberg
2018-06-25 1:40 ` jianchao.wang
2018-06-25 18:51 ` Sagi Grimberg
2018-06-20 18:16 ` [PATCH 0/5]stop normal completion path entering a timeout req Keith Busch
2018-06-21 1:43 ` jianchao.wang
2018-06-21 8:19 ` Christoph Hellwig
2018-06-21 8:22 ` jianchao.wang
2018-06-22 15:10 ` Christoph Hellwig
2018-06-25 1:29 ` jianchao.wang
2018-06-21 13:13 ` jianchao.wang
2018-06-21 15:01 ` Keith Busch
2018-06-21 18:21 ` Bart Van Assche
2018-06-21 21:15 ` Keith Busch
2018-06-21 21:30 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1529500964-28429-5-git-send-email-jianchao.w.wang@oracle.com \
--to=jianchao.w.wang@oracle.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=josef@toxicpanda.com \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).