projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a58d1f) | patch
blk-mq: don't allow merges if turned off for the queue
authorJens Axboe <axboe@fb.com>
Fri, 15 Aug 2014 18:44:08 +0000 (12:44 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 22 Aug 2014 01:37:45 +0000 (20:37 -0500)
commit274a5843ff2f08a89464589d90c64eb65f2c0847
tree6354be68a6e49f6b3579289e33cf15b75f6baa14tree | snapshot
parent8a58d1f1f373238cb0d6d7f8d3dd723aa164b8accommit | diff
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>
block/blk-mq.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.