aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/blkdev.h')
-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 0207a78a8d82..6cbee8395f60 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,
1583 struct request *r1, 1583 struct request *r1,
1584 struct request *r2) 1584 struct request *r2)
1585{ 1585{
1586 return 0; 1586 return true;
1587} 1587}
1588static inline bool blk_integrity_merge_bio(struct request_queue *rq, 1588static inline bool blk_integrity_merge_bio(struct request_queue *rq,
1589 struct request *r, 1589 struct request *r,
1590 struct bio *b) 1590 struct bio *b)
1591{ 1591{
1592 return 0; 1592 return true;
1593} 1593}
1594static inline bool blk_integrity_is_initialized(struct gendisk *g) 1594static inline bool blk_integrity_is_initialized(struct gendisk *g)
1595{ 1595{