summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2014-10-28 20:27:43 -0600
committerJens Axboe <axboe@fb.com>2014-10-28 20:27:43 -0600
commitcb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e (patch)
tree1851aa4f04d1debab9312b25a6970c13d11eb5e7
parentc21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3 (diff)
downloadop-kernel-dev-cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e.zip
op-kernel-dev-cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e.tar.gz
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>
-rw-r--r--include/linux/blkdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0207a78..6cbee83 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1583,13 +1583,13 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq,
struct request *r1,
struct request *r2)
{
- return 0;
+ return true;
}
static inline bool blk_integrity_merge_bio(struct request_queue *rq,
struct request *r,
struct bio *b)
{
- return 0;
+ return true;
}
static inline bool blk_integrity_is_initialized(struct gendisk *g)
{
OpenPOWER on IntegriCloud