From: Christoph Hellwig <hch@lst.de>
Date: Sun, 6 Jun 2021 10:37:55 +0000 (+0200)
Subject: block: rename blk_integrity_queue_supports_integrity
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=339ea4762c7298ed707749d34edb1cfaa20c801c;p=users%2Fhch%2Fblock.git

block: rename blk_integrity_queue_supports_integrity

Shorten the name to blk_queue_supports_integrity which is less
duplicative and more expressive.

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

diff --git a/block/keyslot-manager.c b/block/keyslot-manager.c
index 2c4a55bea6ca..434c45ed882f 100644
--- a/block/keyslot-manager.c
+++ b/block/keyslot-manager.c
@@ -439,7 +439,7 @@ EXPORT_SYMBOL_GPL(blk_ksm_destroy);
 
 bool blk_ksm_register(struct blk_keyslot_manager *ksm, 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/blkdev.h b/include/linux/blkdev.h
index f5f8cd929369..91c40bc75520 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1700,7 +1700,7 @@ struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
 }
 
 static inline bool
-blk_integrity_queue_supports_integrity(struct request_queue *q)
+blk_queue_supports_integrity(struct request_queue *q)
 {
 	return q->integrity.profile;
 }
@@ -1785,8 +1785,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;
 }