Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Eric Biggers and committed by
Jens Axboe
1e8d44bd eebcafae

+9 -9
+1 -1
block/Makefile
··· 36 36 obj-$(CONFIG_BLK_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o 37 37 obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o 38 38 obj-$(CONFIG_BLK_PM) += blk-pm.o 39 - obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o blk-crypto.o 39 + obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o 40 40 obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o 41 41 obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o
+1 -1
block/blk-crypto-fallback.c
··· 12 12 #include <crypto/skcipher.h> 13 13 #include <linux/blk-cgroup.h> 14 14 #include <linux/blk-crypto.h> 15 + #include <linux/blk-crypto-profile.h> 15 16 #include <linux/blkdev.h> 16 17 #include <linux/crypto.h> 17 - #include <linux/keyslot-manager.h> 18 18 #include <linux/mempool.h> 19 19 #include <linux/module.h> 20 20 #include <linux/random.h>
+1 -1
block/blk-crypto.c
··· 11 11 12 12 #include <linux/bio.h> 13 13 #include <linux/blkdev.h> 14 - #include <linux/keyslot-manager.h> 14 + #include <linux/blk-crypto-profile.h> 15 15 #include <linux/module.h> 16 16 #include <linux/slab.h> 17 17
+1 -1
block/keyslot-manager.c block/blk-crypto-profile.c
··· 28 28 29 29 #define pr_fmt(fmt) "blk-crypto: " fmt 30 30 31 - #include <linux/keyslot-manager.h> 31 + #include <linux/blk-crypto-profile.h> 32 32 #include <linux/device.h> 33 33 #include <linux/atomic.h> 34 34 #include <linux/mutex.h>
+1 -1
drivers/md/dm-core.h
··· 13 13 #include <linux/ktime.h> 14 14 #include <linux/genhd.h> 15 15 #include <linux/blk-mq.h> 16 - #include <linux/keyslot-manager.h> 16 + #include <linux/blk-crypto-profile.h> 17 17 18 18 #include <trace/events/block.h> 19 19
+1 -1
drivers/md/dm.c
··· 29 29 #include <linux/refcount.h> 30 30 #include <linux/part_stat.h> 31 31 #include <linux/blk-crypto.h> 32 - #include <linux/keyslot-manager.h> 32 + #include <linux/blk-crypto-profile.h> 33 33 34 34 #define DM_MSG_PREFIX "core" 35 35
+1 -1
drivers/mmc/host/cqhci-crypto.c
··· 6 6 */ 7 7 8 8 #include <linux/blk-crypto.h> 9 - #include <linux/keyslot-manager.h> 9 + #include <linux/blk-crypto-profile.h> 10 10 #include <linux/mmc/host.h> 11 11 12 12 #include "cqhci-crypto.h"
+1 -1
drivers/scsi/ufs/ufshcd.h
··· 32 32 #include <linux/regulator/consumer.h> 33 33 #include <linux/bitfield.h> 34 34 #include <linux/devfreq.h> 35 - #include <linux/keyslot-manager.h> 35 + #include <linux/blk-crypto-profile.h> 36 36 #include "unipro.h" 37 37 38 38 #include <asm/irq.h>
include/linux/keyslot-manager.h include/linux/blk-crypto-profile.h
+1 -1
include/linux/mmc/host.h
··· 15 15 #include <linux/mmc/card.h> 16 16 #include <linux/mmc/pm.h> 17 17 #include <linux/dma-direction.h> 18 - #include <linux/keyslot-manager.h> 18 + #include <linux/blk-crypto-profile.h> 19 19 20 20 struct mmc_ios { 21 21 unsigned int clock; /* clock rate */