| Message ID | 20210913013135.102404-4-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | blk-crypto cleanups | expand |
On Mon, 13 Sept 2021 at 03:35, Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > 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. > > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > block/Makefile | 2 +- > block/blk-crypto-fallback.c | 2 +- > block/{keyslot-manager.c => blk-crypto-profile.c} | 2 +- > block/blk-crypto.c | 2 +- > drivers/md/dm-core.h | 2 +- > drivers/md/dm.c | 2 +- > drivers/mmc/host/cqhci-crypto.c | 2 +- > drivers/scsi/ufs/ufshcd.h | 2 +- > include/linux/{keyslot-manager.h => blk-crypto-profile.h} | 0 > include/linux/mmc/host.h | 2 +- > 10 files changed, 9 insertions(+), 9 deletions(-) > rename block/{keyslot-manager.c => blk-crypto-profile.c} (99%) > rename include/linux/{keyslot-manager.h => blk-crypto-profile.h} (100%) Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC [...] Kind regards Uffe
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
It would be nice to keep the blk-crypto* includes together, though.
On Wed, Sep 15, 2021 at 08:45:00AM +0100, Christoph Hellwig wrote: > Looks good: > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > It would be nice to keep the blk-crypto* includes together, though. I don't see any case in which they aren't together. Unless you're talking about blk-crypto-internal.h, which is a directory-local header so it doesn't get grouped with the <linux/*.h> headers. - Eric
On Wed, Sep 15, 2021 at 10:40:53AM -0700, Eric Biggers wrote: > > It would be nice to keep the blk-crypto* includes together, though. > > I don't see any case in which they aren't together. Unless you're talking about > blk-crypto-internal.h, which is a directory-local header so it doesn't get > grouped with the <linux/*.h> headers. You're right. I skimmed over the patch too quickly.
diff --git a/block/Makefile b/block/Makefile index 41aa1ba69c900..c245e05b67453 100644 --- a/block/Makefile +++ b/block/Makefile @@ -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 diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c index a4a444c83fb3c..9ffbd169e2601 100644 --- a/block/blk-crypto-fallback.c +++ b/block/blk-crypto-fallback.c @@ -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> diff --git a/block/keyslot-manager.c b/block/blk-crypto-profile.c similarity index 99% rename from block/keyslot-manager.c rename to block/blk-crypto-profile.c index 2c4a55bea6ca1..a58daf93c9ba6 100644 --- a/block/keyslot-manager.c +++ b/block/blk-crypto-profile.c @@ -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> diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 103c2e2d50d67..9102803d36232 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -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> diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h index 55dccdfbcb22e..841ed87999e79 100644 --- a/drivers/md/dm-core.h +++ b/drivers/md/dm-core.h @@ -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> diff --git a/drivers/md/dm.c b/drivers/md/dm.c index a011d09cb0fac..249223e20d3d0 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -29,7 +29,7 @@ #include <linux/refcount.h> #include <linux/part_stat.h> #include <linux/blk-crypto.h> -#include <linux/keyslot-manager.h> +#include <linux/blk-crypto-profile.h> #define DM_MSG_PREFIX "core" diff --git a/drivers/mmc/host/cqhci-crypto.c b/drivers/mmc/host/cqhci-crypto.c index 6419cfbb4ab78..628bbfaf83124 100644 --- a/drivers/mmc/host/cqhci-crypto.c +++ b/drivers/mmc/host/cqhci-crypto.c @@ -6,7 +6,7 @@ */ #include <linux/blk-crypto.h> -#include <linux/keyslot-manager.h> +#include <linux/blk-crypto-profile.h> #include <linux/mmc/host.h> #include "cqhci-crypto.h" diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 52ea6f350b181..0f9cbe74642fe 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -32,7 +32,7 @@ #include <linux/regulator/consumer.h> #include <linux/bitfield.h> #include <linux/devfreq.h> -#include <linux/keyslot-manager.h> +#include <linux/blk-crypto-profile.h> #include "unipro.h" #include <asm/irq.h> diff --git a/include/linux/keyslot-manager.h b/include/linux/blk-crypto-profile.h similarity index 100% rename from include/linux/keyslot-manager.h rename to include/linux/blk-crypto-profile.h diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0c0c9a0fdf578..725b1de417673 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -15,7 +15,7 @@ #include <linux/mmc/card.h> #include <linux/mmc/pm.h> #include <linux/dma-direction.h> -#include <linux/keyslot-manager.h> +#include <linux/blk-crypto-profile.h> struct mmc_ios { unsigned int clock; /* clock rate */