From: Robert Elliott <elliott@hp.com>
Date: Tue, 20 May 2014 21:46:26 +0000 (-0500)
Subject: blk-mq: Micro-optimize blk_queue_nomerges() check
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~49^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da41a589f52464e24ddefe76814ee35bfb07950c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed