From: Christoph Hellwig Date: Fri, 7 Feb 2014 18:22:37 +0000 (-0800) Subject: blk-mq: divert __blk_put_request for MQ ops X-Git-Tag: firefly_0821_release~176^2~4428^2~19 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f5ba581c0d3ba0a76fe138123c1c2817ffcbeb1;p=firefly-linux-kernel-4.4.55.git blk-mq: divert __blk_put_request for MQ ops __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 Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index c00e0bdeab4a..06636f3ad424 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);