From: Jens Axboe <axboe@fb.com>
Date: Fri, 15 Aug 2014 18:44:08 +0000 (-0600)
Subject: blk-mq: don't allow merges if turned off for the queue
X-Git-Tag: fix-v3.17-io-chain-v3~18^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=274a5843ff2f08a89464589d90c64eb65f2c0847;p=pandora-kernel.git

blk-mq: don't allow merges if turned off for the queue

blk-mq uses BLK_MQ_F_SHOULD_MERGE, as set by the driver at init time,
to determine whether it should merge IO or not. However, this could
also be disabled by the admin, if merging is switched off through
sysfs. So check the general queue state as well before attempting
to merge IO.

Reported-by: Rob Elliott <Elliott@hp.com>
Tested-by: Rob Elliott <Elliott@hp.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed