diff options
| author | Eric Biggers <ebiggers@google.com> | 2021-11-23 17:37:33 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-11-29 06:38:51 -0700 |
| commit | 72cd9df2ef788d88c138d51223a01ca6281f232d (patch) | |
| tree | 0d542b8eee1d2759fd6fa0b5bd5e5b44da55a476 /block/blk-integrity.c | |
| parent | 5b13bc8a3fd519d86e5b1a0b1d1b996cace62f3f (diff) | |
| download | lwn-72cd9df2ef788d88c138d51223a01ca6281f232d.tar.gz lwn-72cd9df2ef788d88c138d51223a01ca6281f232d.zip | |
blk-crypto: remove blk_crypto_unregister()
This function is trivial and is only used in one place. Having this
function is misleading because it implies that blk_crypto_register()
needs to be paired with blk_crypto_unregister(), which is not the case.
Just set disk->queue->crypto_profile to NULL directly.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211124013733.347612-1-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-integrity.c')
| -rw-r--r-- | block/blk-integrity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index d670d54e5f7a..69eed260a823 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->crypto_profile) { pr_warn("blk-integrity: Integrity and hardware inline encryption are not supported together. Disabling hardware inline encryption.\n"); - blk_crypto_unregister(disk->queue); + disk->queue->crypto_profile = NULL; } #endif } |