Skip to content

Commit 1e8d44b

Browse files
ebiggersaxboe
authored andcommitted
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 <[email protected]> # For MMC Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Mike Snitzer <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Signed-off-by: Eric Biggers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent eebcafa commit 1e8d44b

File tree

10 files changed

+9
-9
lines changed

10 files changed

+9
-9
lines changed

Diff for: block/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
3636
obj-$(CONFIG_BLK_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o
3737
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
3838
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
4040
obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
4141
obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o

Diff for: block/blk-crypto-fallback.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#include <crypto/skcipher.h>
1313
#include <linux/blk-cgroup.h>
1414
#include <linux/blk-crypto.h>
15+
#include <linux/blk-crypto-profile.h>
1516
#include <linux/blkdev.h>
1617
#include <linux/crypto.h>
17-
#include <linux/keyslot-manager.h>
1818
#include <linux/mempool.h>
1919
#include <linux/module.h>
2020
#include <linux/random.h>

Diff for: block/keyslot-manager.c renamed to block/blk-crypto-profile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

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

31-
#include <linux/keyslot-manager.h>
31+
#include <linux/blk-crypto-profile.h>
3232
#include <linux/device.h>
3333
#include <linux/atomic.h>
3434
#include <linux/mutex.h>

Diff for: block/blk-crypto.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <linux/bio.h>
1313
#include <linux/blkdev.h>
14-
#include <linux/keyslot-manager.h>
14+
#include <linux/blk-crypto-profile.h>
1515
#include <linux/module.h>
1616
#include <linux/slab.h>
1717

Diff for: drivers/md/dm-core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/ktime.h>
1414
#include <linux/genhd.h>
1515
#include <linux/blk-mq.h>
16-
#include <linux/keyslot-manager.h>
16+
#include <linux/blk-crypto-profile.h>
1717

1818
#include <trace/events/block.h>
1919

Diff for: drivers/md/dm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/refcount.h>
3030
#include <linux/part_stat.h>
3131
#include <linux/blk-crypto.h>
32-
#include <linux/keyslot-manager.h>
32+
#include <linux/blk-crypto-profile.h>
3333

3434
#define DM_MSG_PREFIX "core"
3535

Diff for: drivers/mmc/host/cqhci-crypto.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <linux/blk-crypto.h>
9-
#include <linux/keyslot-manager.h>
9+
#include <linux/blk-crypto-profile.h>
1010
#include <linux/mmc/host.h>
1111

1212
#include "cqhci-crypto.h"

Diff for: drivers/scsi/ufs/ufshcd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <linux/regulator/consumer.h>
3333
#include <linux/bitfield.h>
3434
#include <linux/devfreq.h>
35-
#include <linux/keyslot-manager.h>
35+
#include <linux/blk-crypto-profile.h>
3636
#include "unipro.h"
3737

3838
#include <asm/irq.h>
File renamed without changes.

Diff for: include/linux/mmc/host.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/mmc/card.h>
1616
#include <linux/mmc/pm.h>
1717
#include <linux/dma-direction.h>
18-
#include <linux/keyslot-manager.h>
18+
#include <linux/blk-crypto-profile.h>
1919

2020
struct mmc_ios {
2121
unsigned int clock; /* clock rate */

0 commit comments

Comments
 (0)