On 06/18/2017 01:24 AM, Christoph Hellwig wrote: > On Sat, Jun 17, 2017 at 03:50:40PM -0600, Jens Axboe wrote: >> On 06/16/2017 10:15 AM, Christoph Hellwig wrote: >>> Merge three functions only tail-called by blk_mq_free_request into >>> blk_mq_free_request. >> >> This doesn't compile, as blk_mq_merge_queue_io() has a call to >> __blk_mq_finish_request(). > > Hmm. The tree I've based my work on certainly doesn't. But it doesn't > even have blk_mq_merge_queue_io at all either, as does your for-4.13/block > block tree. > > What am I missing? I tossed it into master for testing by mistake. It's fine against for-4.13/block, my fault. I ran it through the regular testing and no issues uncovered so far. -- Jens Axboe