From: Sagi Grimberg <sagig@mellanox.com>
Date: Fri, 11 Sep 2015 15:03:04 +0000 (-0600)
Subject: block: Refuse request/bio merges with gaps in the integrity payload
X-Git-Tag: omap-for-v4.3/fixes-rc5~111^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f39add3b08cbbdb99abe50e6d7c342e6800d684;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed