| Message ID | 20221114042944.1009870-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] blk-crypto: don't use struct request_queue for public interfaces | expand |
On Mon, Nov 14, 2022 at 05:29:44AM +0100, Christoph Hellwig wrote: > blk_crypto_get_keyslot, blk_crypto_put_keyslot, __blk_crypto_evict_key > and __blk_crypto_cfg_supported are only used internally by the > blk-crypto code, so move the out of blk-crypto-profile.h, which is > included by drivers that supply blk-crypto functionality. The buildbot complained that blk-crypto-profile.c now needs a blk-crypto-internal.h include, which can be done by folding this in: diff --git a/block/blk-crypto-profile.c b/block/blk-crypto-profile.c index 96c511967386d..0307fb0d95d34 100644 --- a/block/blk-crypto-profile.c +++ b/block/blk-crypto-profile.c @@ -32,6 +32,7 @@ #include <linux/wait.h> #include <linux/blkdev.h> #include <linux/blk-integrity.h> +#include "blk-crypto-internal.h" struct blk_crypto_keyslot { atomic_t slot_refs;
On Mon, Nov 14, 2022 at 05:29:44AM +0100, Christoph Hellwig wrote: > blk_crypto_get_keyslot, blk_crypto_put_keyslot, __blk_crypto_evict_key > and __blk_crypto_cfg_supported are only used internally by the > blk-crypto code, so move the out of blk-crypto-profile.h, which is > included by drivers that supply blk-crypto functionality. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-crypto-internal.h | 12 ++++++++++++ > include/linux/blk-crypto-profile.h | 12 ------------ > 2 files changed, 12 insertions(+), 12 deletions(-) With the include of blk-crypto-internal.h in blk-crypto-profile.c added, feel free to add: Reviewed-by: Eric Biggers <ebiggers@google.com> - Eric
diff --git a/block/blk-crypto-internal.h b/block/blk-crypto-internal.h index e6818ffaddbf8..d31fa80454e49 100644 --- a/block/blk-crypto-internal.h +++ b/block/blk-crypto-internal.h @@ -65,6 +65,18 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq) return rq->crypt_ctx; } +blk_status_t blk_crypto_get_keyslot(struct blk_crypto_profile *profile, + const struct blk_crypto_key *key, + struct blk_crypto_keyslot **slot_ptr); + +void blk_crypto_put_keyslot(struct blk_crypto_keyslot *slot); + +int __blk_crypto_evict_key(struct blk_crypto_profile *profile, + const struct blk_crypto_key *key); + +bool __blk_crypto_cfg_supported(struct blk_crypto_profile *profile, + const struct blk_crypto_config *cfg); + #else /* CONFIG_BLK_INLINE_ENCRYPTION */ static inline int blk_crypto_sysfs_register(struct request_queue *q) diff --git a/include/linux/blk-crypto-profile.h b/include/linux/blk-crypto-profile.h index bbab65bd54288..e6802b69cdd64 100644 --- a/include/linux/blk-crypto-profile.h +++ b/include/linux/blk-crypto-profile.h @@ -138,18 +138,6 @@ int devm_blk_crypto_profile_init(struct device *dev, unsigned int blk_crypto_keyslot_index(struct blk_crypto_keyslot *slot); -blk_status_t blk_crypto_get_keyslot(struct blk_crypto_profile *profile, - const struct blk_crypto_key *key, - struct blk_crypto_keyslot **slot_ptr); - -void blk_crypto_put_keyslot(struct blk_crypto_keyslot *slot); - -bool __blk_crypto_cfg_supported(struct blk_crypto_profile *profile, - const struct blk_crypto_config *cfg); - -int __blk_crypto_evict_key(struct blk_crypto_profile *profile, - const struct blk_crypto_key *key); - void blk_crypto_reprogram_all_keys(struct blk_crypto_profile *profile); void blk_crypto_profile_destroy(struct blk_crypto_profile *profile);
blk_crypto_get_keyslot, blk_crypto_put_keyslot, __blk_crypto_evict_key and __blk_crypto_cfg_supported are only used internally by the blk-crypto code, so move the out of blk-crypto-profile.h, which is included by drivers that supply blk-crypto functionality. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-crypto-internal.h | 12 ++++++++++++ include/linux/blk-crypto-profile.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-)