diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-06-11 08:44:52 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-06-24 17:15:57 +0200 |
| commit | ff029451496364eef0d342618dfc9972b78f3392 (patch) | |
| tree | 6ab48289cb45e1f8e0c5ada8d60f59deb0aa94bc /drivers/nvme/host/nvme.h | |
| parent | nvme-rdma: factor out a nvme_rdma_end_request helper (diff) | |
| download | linux-ff029451496364eef0d342618dfc9972b78f3392.tar.xz linux-ff029451496364eef0d342618dfc9972b78f3392.zip | |
nvme: use blk_mq_complete_request_remote to avoid an indirect function call
Use the new blk_mq_complete_request_remote helper to avoid an indirect
function call in the completion fast path.
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme/host/nvme.h')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 034613205701..61780c38f51f 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -472,7 +472,7 @@ static inline u32 nvme_bytes_to_numd(size_t len) return (len >> 2) - 1; } -static inline void nvme_end_request(struct request *req, __le16 status, +static inline bool nvme_end_request(struct request *req, __le16 status, union nvme_result result) { struct nvme_request *rq = nvme_req(req); @@ -481,8 +481,9 @@ static inline void nvme_end_request(struct request *req, __le16 status, rq->result = result; /* inject error when permitted by fault injection framework */ nvme_should_fail(req); - if (likely(!blk_should_fake_timeout(req->q))) - blk_mq_complete_request(req); + if (unlikely(blk_should_fake_timeout(req->q))) + return true; + return blk_mq_complete_request_remote(req); } static inline void nvme_get_ctrl(struct nvme_ctrl *ctrl) |