[PATCH 2/4] blk-mq: divert __blk_put_request for MQ ops

Christoph Hellwig
2014-02-07T18:22:37Z

[-- Attachment #1: 0002-blk-mq-divert-__blk_put_request-for-MQ-ops.patch --]
[-- Type: text/plain, Size: 671 bytes --]

__blk_put_request needs to call into the blk-mq code just like
blk_put_request. As we don't have the queue lock in this case both
end up calling the same function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-core.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index c00e0bd..06636f3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1278,6 +1278,11 @@ void __blk_put_request(struct request_queue *q, struct request *req)
if (unlikely(!q))
return;

+ if (q->mq_ops) {
+ blk_mq_free_request(req);
+ return;
+ }
+
blk_pm_put_request(req);

elv_completed_request(q, req);
--
1.7.10.4