tree dd495ebf5446f531d88aee04f00857cff243e586
parent 5e7c4274a70aa2d6f485996d0ca1dad52d0039ca
author Sagi Grimberg <sagig@mellanox.com> 1441983784 -0600
committer Jens Axboe <axboe@fb.com> 1441983784 -0600

block: Refuse request/bio merges with gaps in the integrity payload

If a driver sets the block queue virtual boundary mask, it means that
it cannot handle gaps so we must not allow those in the integrity
payload as well.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>

Fixed up by me to have duplicate integrity merge functions, depending
on whether block integrity is enabled or not. Fixes a compilations
issue with CONFIG_BLK_DEV_INTEGRITY unset.

Signed-off-by: Jens Axboe <axboe@fb.com>