blk-mq: Micro-optimize blk_queue_nomerges() check
authorRobert Elliott <elliott@hp.com>
Tue, 20 May 2014 21:46:26 +0000 (16:46 -0500)
committerJens Axboe <axboe@fb.com>
Mon, 30 Mar 2015 18:54:48 +0000 (12:54 -0600)
commit63e9ea6ad8bef5eca0d25c709e2d7fd71e523d6a
tree0a85c6097b1e93c46393b1438bbfb52a09fe692e
parent3ec8f8c4efe2004b22d719655175bcdab75d0f13
blk-mq: Micro-optimize blk_queue_nomerges() check

In blk_mq_make_request(), do the blk_queue_nomerges() check
outside the call to blk_attempt_plug_merge() to eliminate
function call overhead when nomerges=2 (disabled)

Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-core.c
block/blk-mq.c