blk-integrity: empty implementation when disabled
PATCH v2 1/1 blk-integrity: empty implementation when disabled
This patch moves the blk_integrity_payload definition outside the CONFIG_BLK_DEV_INTERITY dependency and provides empty function implementations when the kernel configuration disables integrity extensions. This simplifies drivers that make use of these to map user data so they don't need to repeat the same configuration checks.
Signed-off-by Keith Busch <[email protected]>
---
v1 -> v2: Fixed corrupted patch and subject line spelling error
include/linux/bio.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
include/linux/bio.h +22 -10
@@ -318,16 +318,6 @@ enum bip_flags { BIP_IP_CHECKSUM = 1 << 4, /* IP checksum */ }; -#if defined(CONFIG_BLK_DEV_INTEGRITY ) - -static inline struct bio_integrity_payload *bio_integrity (struct bio *bio) -{ -if (bio->bi_rw &REQ_INTEGRITY ) -return bio->bi_integrity; - -return NULL ; -} -/* * bio integrity payload */
@@ -349,6 +339,16 @@ struct bio_integrity_payload {struct bio_vec bip_inline_vecs[0 ];/* embedded bvec array */ }; +#if defined(CONFIG_BLK_DEV_INTEGRITY ) + +static inline struct bio_integrity_payload *bio_integrity (struct bio *bio) +{ +if (bio->bi_rw &REQ_INTEGRITY ) +return bio->bi_integrity; + +return NULL ; +} +static inline bool bio_integrity_flagged (struct bio *bio,enum bip_flags flag) {struct bio_integrity_payload *bip =bio_integrity (bio);
@@ -795,6 +795,18 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)return false; } +static inline void *bio_integrity_alloc (struct bio * bio,gfp_t gfp, +unsigned int nr) +{ +return NULL ; +} + +static inline int bio_integrity_add_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset) +{ +return 0 ; +} +#endif /* CONFIG_BLK_DEV_INTEGRITY */ #endif /* CONFIG_BLOCK */
Signature · 1 line
1.7.10.4