block: Refuse request/bio merges with gaps in the integrity payload
authorSagi Grimberg <sagig@mellanox.com>
Fri, 11 Sep 2015 15:03:04 +0000 (09:03 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 11 Sep 2015 15:03:04 +0000 (09:03 -0600)
commit7f39add3b08cbbdb99abe50e6d7c342e6800d684
treedd495ebf5446f531d88aee04f00857cff243e586
parent5e7c4274a70aa2d6f485996d0ca1dad52d0039ca
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>
block/blk-integrity.c
block/blk-merge.c
include/linux/blkdev.h