Thread (17 messages) 17 messages, 3 authors, 2021-09-16

Re: [PATCH 4/5] blk-crypto: rename blk_keyslot_manager to blk_crypto_profile

From: Eric Biggers <ebiggers@kernel.org>
Date: 2021-09-14 21:52:55
Also in: dm-devel, linux-mmc, linux-scsi

On Sun, Sep 12, 2021 at 06:31:34PM -0700, Eric Biggers wrote:
quoted hunk ↗ jump to hunk
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 69a12177dfb62..db656d12050f7 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -411,7 +411,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template
 #ifdef CONFIG_BLK_INLINE_ENCRYPTION
 	if (disk->queue->ksm) {
 		pr_warn("blk-integrity: Integrity and hardware inline encryption are not supported together. Disabling hardware inline encryption.\n");
-		blk_ksm_unregister(disk->queue);
+		blk_crypto_unregister(disk->queue);
 	}
 #endif
 }
Note, there is a build error here when CONFIG_BLK_DEV_INTEGRITY=y, so I'll have
to send a new version even if there are no other comments.

- Eric
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help