block: rename blk_integrity_queue_supports_integrity

horten the name to blk_queue_supports_integrity which is less
duplicative.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-crypto-profile.c b/block/blk-crypto-profile.c
index 96c511967386d56fa4eb6eaeaef16fe838235b77..8a93c387d3aaa09d52965dd3e0c4f6b8dbbe7ebb 100644 (file)
--- 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 378b2459efe2da03565997d0980ed10656516c17..45fb04f9c5481476c87fd95235b1870e3e525cdf 100644 (file)
--- 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;
 }