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>
Tue, 20 May 2014 21:49:03 +0000 (15:49 -0600)
commitda41a589f52464e24ddefe76814ee35bfb07950c
treee3270f36a1a5766e2433b70b0eef4e2205096075
parenteba7176826ddab1d04c51bb2d5f2bbf22865444c
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