Commit 1e8d44bd authored Oct 18, 2021 by Eric Biggers Committed by Jens Axboe Oct 21, 2021

blk-crypto: rename keyslot-manager files to blk-crypto-profile



In preparation for renaming struct blk_keyslot_manager to struct
blk_crypto_profile, rename the keyslot-manager.h and keyslot-manager.c
source files.  Renaming these files separately before making a lot of
changes to their contents makes it easier for git to understand that
they were renamed.

Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20211018180453.40441-3-ebiggers@kernel.org


Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent eebcafae

block/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,6 @@ obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
		obj-$(CONFIG_BLK_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o
		obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
		obj-$(CONFIG_BLK_PM) += blk-pm.o
		obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o blk-crypto.o
		obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o
		obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
		obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o

block/blk-crypto-fallback.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,9 +12,9 @@
		#include <crypto/skcipher.h>
		#include <linux/blk-cgroup.h>
		#include <linux/blk-crypto.h>
		#include <linux/blk-crypto-profile.h>
		#include <linux/blkdev.h>
		#include <linux/crypto.h>
		#include <linux/keyslot-manager.h>
		#include <linux/mempool.h>
		#include <linux/module.h>
		#include <linux/random.h>

block/keyslot-manager.c→block/blk-crypto-profile.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@

		#define pr_fmt(fmt) "blk-crypto: " fmt

		#include <linux/keyslot-manager.h>
		#include <linux/blk-crypto-profile.h>
		#include <linux/device.h>
		#include <linux/atomic.h>
		#include <linux/mutex.h>

block/blk-crypto.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@

		#include <linux/bio.h>
		#include <linux/blkdev.h>
		#include <linux/keyslot-manager.h>
		#include <linux/blk-crypto-profile.h>
		#include <linux/module.h>
		#include <linux/slab.h>

drivers/md/dm-core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include <linux/ktime.h>
		#include <linux/genhd.h>
		#include <linux/blk-mq.h>
		#include <linux/keyslot-manager.h>
		#include <linux/blk-crypto-profile.h>

		#include <trace/events/block.h>