moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>

(cherry picked from commit 1e8d44bddf57f6d878e083f281a34d5c88feb7db)
Bug: 160883801
Bug: 162257402
Bug: 207390665
Bug: 234653003
Change-Id: I19c9033d2dee2cc41a9274448d4d99f4d22dce89
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2021-10-18 11:04:51 -07:00
parent be6647b410
commit 2b846ef428
10 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/Makefile
View File

@@ -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_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
obj-$(CONFIG_BLK_PM) += blk-pm.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_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o

2
block/blk-crypto-fallback.c
View File

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

2
block/keyslot-manager.c → block/blk-crypto-profile.c
View File

@@ -28,7 +28,7 @@
#define pr_fmt(fmt) "blk-crypto: " fmt #define pr_fmt(fmt) "blk-crypto: " fmt
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/mutex.h> #include <linux/mutex.h>

2
block/blk-crypto.c
View File

@@ -11,7 +11,7 @@
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>

2
drivers/md/dm-core.h
View File

@@ -13,7 +13,7 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/genhd.h> #include <linux/genhd.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include <trace/events/block.h> #include <trace/events/block.h>

2
drivers/md/dm.c
View File

@@ -29,7 +29,7 @@
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/part_stat.h> #include <linux/part_stat.h>
#include <linux/blk-crypto.h> #include <linux/blk-crypto.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#define DM_MSG_PREFIX "core" #define DM_MSG_PREFIX "core"

2
drivers/mmc/host/cqhci-crypto.c
View File

@@ -6,7 +6,7 @@
*/ */
#include <linux/blk-crypto.h> #include <linux/blk-crypto.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include "cqhci-crypto.h" #include "cqhci-crypto.h"

2
drivers/scsi/ufs/ufshcd.h
View File

@@ -32,7 +32,7 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/bitfield.h> #include <linux/bitfield.h>
#include <linux/devfreq.h> #include <linux/devfreq.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include "unipro.h" #include "unipro.h"
#include <asm/irq.h> #include <asm/irq.h>

0
include/linux/keyslot-manager.h → include/linux/blk-crypto-profile.h
View File

2
include/linux/mmc/host.h
View File

@@ -15,7 +15,7 @@
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
#include <linux/mmc/pm.h> #include <linux/mmc/pm.h>
#include <linux/dma-direction.h> #include <linux/dma-direction.h>
#include <linux/keyslot-manager.h> #include <linux/blk-crypto-profile.h>
#include <linux/android_kabi.h> #include <linux/android_kabi.h>
struct mmc_ios { struct mmc_ios {