Commit cb1a5ab6 authored Oct 28, 2014 by Martin K. Petersen Committed by Jens Axboe Oct 28, 2014

block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined



Commit 4eaf99be 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>

parent c21e59d8

include/linux/blkdev.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)
		{