From: Jianchao Wang <jianchao.w.wang@oracle.com>
To: axboe@kernel.dk, hch@lst.de
Cc: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com,
linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] scsi_transport_fc: use __blk_complete_request in fc_bsg_job_timeout
Date: Fri, 15 Jun 2018 09:57:27 +0800 [thread overview]
Message-ID: <1529027847-29085-2-git-send-email-jianchao.w.wang@oracle.com> (raw)
In-Reply-To: <1529027847-29085-1-git-send-email-jianchao.w.wang@oracle.com>
bsg is based on blk-legacy, so we should use blk-legacy interface
here. On the other hand, for blk-legacy, the timed out request
has 'complete' mark, so use __blk_complete_request.
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
---
drivers/scsi/scsi_transport_fc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 1da3d71..1394810 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3592,7 +3592,7 @@ fc_bsg_job_timeout(struct request *req)
/* the blk_end_sync_io() doesn't check the error */
if (inflight)
- blk_mq_complete_request(req);
+ __blk_complete_request(req);
return BLK_EH_DONE;
}
--
2.7.4
next prev parent reply other threads:[~2018-06-15 1:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-15 1:57 [PATCH 1/2] block: export __blk_complete_request Jianchao Wang
2018-06-15 1:57 ` Jianchao Wang [this message]
2018-06-15 2:17 ` Ming Lei
2018-06-15 2:22 ` jianchao.wang
2018-06-15 2:44 ` jianchao.wang
2018-06-15 2:56 ` Ming Lei
2018-06-15 3:04 ` jianchao.wang
2018-06-15 3:20 ` Ming Lei
2018-06-15 3:26 ` jianchao.wang
2018-06-15 4:03 ` Ming Lei
2018-06-15 5:10 ` jianchao.wang
2018-06-15 11:58 ` Christoph Hellwig
2018-06-15 2:49 ` Ming Lei
2018-06-19 14:09 ` Christoph Hellwig
2018-06-19 14:52 ` jianchao.wang
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=1529027847-29085-2-git-send-email-jianchao.w.wang@oracle.com \
--to=jianchao.w.wang@oracle.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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).