From bd8a5d4802193d3611dc1ec166c95e172086025c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 9 Jun 2022 07:55:04 +0200 Subject: [PATCH] block: rename blk_integrity_queue_supports_integrity horten the name to blk_queue_supports_integrity which is less duplicative. Signed-off-by: Christoph Hellwig --- block/blk-crypto-profile.c | 2 +- include/linux/blk-integrity.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/block/blk-crypto-profile.c b/block/blk-crypto-profile.c index 96c511967386..8a93c387d3aa 100644 --- a/block/blk-crypto-profile.c +++ b/block/blk-crypto-profile.c @@ -454,7 +454,7 @@ EXPORT_SYMBOL_GPL(blk_crypto_profile_destroy); bool blk_crypto_register(struct blk_crypto_profile *profile, struct request_queue *q) { - if (blk_integrity_queue_supports_integrity(q)) { + if (blk_queue_supports_integrity(q)) { pr_warn("Integrity and hardware inline encryption are not supported together. Disabling hardware inline encryption.\n"); return false; } diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h index 378b2459efe2..45fb04f9c548 100644 --- a/include/linux/blk-integrity.h +++ b/include/linux/blk-integrity.h @@ -59,8 +59,7 @@ bdev_get_integrity(struct block_device *bdev) return blk_get_integrity(bdev->bd_disk); } -static inline bool -blk_integrity_queue_supports_integrity(struct request_queue *q) +static inline bool blk_queue_supports_integrity(struct request_queue *q) { return q->integrity.profile; } @@ -134,8 +133,7 @@ static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk) { return NULL; } -static inline bool -blk_integrity_queue_supports_integrity(struct request_queue *q) +static inline bool blk_queue_supports_integrity(struct request_queue *q) { return false; } -- 2.50.1