From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 11 Feb 2014 16:27:14 +0000 (-0800)
Subject: blk-mq: pair blk_mq_start_request / blk_mq_requeue_request
X-Git-Tag: v3.14-rc3~22^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49f5baa5109897b8cee491e8a7c4d74052b6bc1e;p=pandora-kernel.git

blk-mq: pair blk_mq_start_request / blk_mq_requeue_request

Make sure we have a proper pairing between starting and requeueing
requests.  Move the dma drain and REQ_END setup into blk_mq_start_request,
and make sure blk_mq_requeue_request properly undoes them, giving us
a pair of function to prepare and unprepare a request without leaving
side effects.

Together this ensures we always clean up properly after
BLK_MQ_RQ_QUEUE_BUSY returns from ->queue_rq.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed