redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined 

Commit 4eaf99bead 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>
hifive-unleashed-5.1
Martin K. Petersen 2014-10-28 20:27:43 -06:00 committed by Jens Axboe
parent c21e59d8dc
commit cb1a5ab6ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/blkdev.h
View File

@ -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)
{