block: prevent request-to-request merging with gaps if not allowed
authorKeith Busch <keith.busch@intel.com>
Wed, 11 Feb 2015 15:20:13 +0000 (08:20 -0700)
committerJens Axboe <axboe@fb.com>
Wed, 11 Feb 2015 16:23:52 +0000 (09:23 -0700)
commit854fbb9c699e34fe4889e6907c4fc73889192223
tree862ba8836f31df9793c5efb23e8bd04d5b2dad1d
parent201f201c33220f53856fd300e1990b779538d67f
block: prevent request-to-request merging with gaps if not allowed

If the queue has SG_GAPS set, we must not merge across an sg gap.
This is caught for the bio case, but currently not for the
more rare case of merging two requests directly.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Cut the dm bits, those will go through the dm tree, and fixed
the test_bit() test.

Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-merge.c