aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-softirq.c1
-rw-r--r--drivers/block/null_blk.c2
-rw-r--r--drivers/scsi/scsi_transport_fc.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 01e2b353a2b9..15c1f5e12eb8 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -144,6 +144,7 @@ do_local:
144 144
145 local_irq_restore(flags); 145 local_irq_restore(flags);
146} 146}
147EXPORT_SYMBOL(__blk_complete_request);
147 148
148/** 149/**
149 * blk_complete_request - end I/O on a request 150 * blk_complete_request - end I/O on a request
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 2bdadd7f1454..3d8bdbe9bd35 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -1365,7 +1365,7 @@ static blk_qc_t null_queue_bio(struct request_queue *q, struct bio *bio)
1365static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq) 1365static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)
1366{ 1366{
1367 pr_info("null: rq %p timed out\n", rq); 1367 pr_info("null: rq %p timed out\n", rq);
1368 blk_mq_complete_request(rq); 1368 __blk_complete_request(rq);
1369 return BLK_EH_DONE; 1369 return BLK_EH_DONE;
1370} 1370}
1371 1371
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 1da3d71e9f61..13948102ca29 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)
3592 3592
3593 /* the blk_end_sync_io() doesn't check the error */ 3593 /* the blk_end_sync_io() doesn't check the error */
3594 if (inflight) 3594 if (inflight)
3595 blk_mq_complete_request(req); 3595 __blk_complete_request(req);
3596 return BLK_EH_DONE; 3596 return BLK_EH_DONE;
3597} 3597}
3598 3598