diff options
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 443df75d2cde..d3ae9ad97213 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -860,7 +860,6 @@ void kblockd_flush_work(struct work_struct *work); | |||
860 | #define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \ | 860 | #define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \ |
861 | MODULE_ALIAS("block-major-" __stringify(major) "-*") | 861 | MODULE_ALIAS("block-major-" __stringify(major) "-*") |
862 | 862 | ||
863 | |||
864 | #if defined(CONFIG_BLK_DEV_INTEGRITY) | 863 | #if defined(CONFIG_BLK_DEV_INTEGRITY) |
865 | 864 | ||
866 | #define INTEGRITY_FLAG_READ 1 /* verify data integrity on read */ | 865 | #define INTEGRITY_FLAG_READ 1 /* verify data integrity on read */ |
@@ -945,8 +944,6 @@ static inline int bdev_integrity_enabled(struct block_device *bdev, int rw) | |||
945 | 944 | ||
946 | static inline int blk_integrity_rq(struct request *rq) | 945 | static inline int blk_integrity_rq(struct request *rq) |
947 | { | 946 | { |
948 | BUG_ON(rq->bio == NULL); | ||
949 | |||
950 | return bio_integrity(rq->bio); | 947 | return bio_integrity(rq->bio); |
951 | } | 948 | } |
952 | 949 | ||
@@ -963,7 +960,6 @@ static inline int blk_integrity_rq(struct request *rq) | |||
963 | 960 | ||
964 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ | 961 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ |
965 | 962 | ||
966 | |||
967 | #else /* CONFIG_BLOCK */ | 963 | #else /* CONFIG_BLOCK */ |
968 | /* | 964 | /* |
969 | * stubs for when the block layer is configured out | 965 | * stubs for when the block layer is configured out |