block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
authorMartin K. Petersen <martin.petersen@oracle.com>
Wed, 29 Oct 2014 02:27:43 +0000 (20:27 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 29 Oct 2014 02:27:43 +0000 (20:27 -0600)
commitcb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e
tree1851aa4f04d1debab9312b25a6970c13d11eb5e7
parentc21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined

Commit 4eaf99beadce switched to returning bool and as a result reversed
the logic of the integrity merge checks.  However, the empty stubs used
when the block integrity code is compiled out were still returning
0. Make these stubs return "true".

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Tested-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
include/linux/blkdev.h