stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-28 17:40:21 +10:00
Code Issues Releases Wiki Activity

blk-crypto: pass a gendisk to blk_crypto_sysfs_{,un}register

Browse Source 
Prepare for changes to the block layer sysfs handling by passing the
readily available gendisk to blk_crypto_sysfs_{,un}register.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20221114042637.1009333-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2022-11-14 05:26:33 +01:00 committed by Jens Axboe
parent c62256dda3
commit 450deb93df
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/blk-crypto-internal.h
View File

@ -21,9 +21,9 @@ extern const struct blk_crypto_mode blk_crypto_modes[];
#ifdef CONFIG_BLK_INLINE_ENCRYPTION #ifdef CONFIG_BLK_INLINE_ENCRYPTION
int blk_crypto_sysfs_register(struct request_queue *q); int blk_crypto_sysfs_register(struct gendisk *disk);
void blk_crypto_sysfs_unregister(struct request_queue *q); void blk_crypto_sysfs_unregister(struct gendisk *disk);
void bio_crypt_dun_increment(u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE], void bio_crypt_dun_increment(u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE],
unsigned int inc); unsigned int inc);
@ -79,12 +79,14 @@ bool __blk_crypto_cfg_supported(struct blk_crypto_profile *profile,
#else /* CONFIG_BLK_INLINE_ENCRYPTION */ #else /* CONFIG_BLK_INLINE_ENCRYPTION */
static inline int blk_crypto_sysfs_register(struct request_queue *q) static inline int blk_crypto_sysfs_register(struct gendisk *disk)
{ {
return 0; return 0;
} }
static inline void blk_crypto_sysfs_unregister(struct request_queue *q) { } static inline void blk_crypto_sysfs_unregister(struct gendisk *disk)
{
}
static inline bool bio_crypt_rq_ctx_compatible(struct request *rq, static inline bool bio_crypt_rq_ctx_compatible(struct request *rq,
struct bio *bio) struct bio *bio)

7
block/blk-crypto-sysfs.c
View File

@ -126,8 +126,9 @@ static struct kobj_type blk_crypto_ktype = {
* If the request_queue has a blk_crypto_profile, create the "crypto" * If the request_queue has a blk_crypto_profile, create the "crypto"
* subdirectory in sysfs (/sys/block/$disk/queue/crypto/). * subdirectory in sysfs (/sys/block/$disk/queue/crypto/).
*/ */
int blk_crypto_sysfs_register(struct request_queue *q) int blk_crypto_sysfs_register(struct gendisk *disk)
{ {
struct request_queue *q = disk->queue;
struct blk_crypto_kobj *obj; struct blk_crypto_kobj *obj;
int err; int err;
@ -149,9 +150,9 @@ int blk_crypto_sysfs_register(struct request_queue *q)
return 0; return 0;
} }
void blk_crypto_sysfs_unregister(struct request_queue *q) void blk_crypto_sysfs_unregister(struct gendisk *disk)
{ {
kobject_put(q->crypto_kobject); kobject_put(disk->queue->crypto_kobject);
} }
static int __init blk_crypto_sysfs_init(void) static int __init blk_crypto_sysfs_init(void)

4
block/blk-sysfs.c
View File

@ -836,7 +836,7 @@ int blk_register_queue(struct gendisk *disk)
goto put_dev; goto put_dev;
} }
ret = blk_crypto_sysfs_register(q); ret = blk_crypto_sysfs_register(disk);
if (ret) if (ret)
goto put_dev; goto put_dev;
@ -913,7 +913,7 @@ void blk_unregister_queue(struct gendisk *disk)
*/ */
if (queue_is_mq(q)) if (queue_is_mq(q))
blk_mq_sysfs_unregister(disk); blk_mq_sysfs_unregister(disk);
blk_crypto_sysfs_unregister(q); blk_crypto_sysfs_unregister(disk);
mutex_lock(&q->sysfs_lock); mutex_lock(&q->sysfs_lock);
elv_unregister_queue(q); elv_unregister_queue(q);