diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-11-14 05:26:36 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-11-30 19:09:00 +0100 |
| commit | 2bd85221a625b316114bafaab527770b607095d3 (patch) | |
| tree | cd00e40d6010e33c1e2f957ed1f2203c84a43b13 /block/blk-crypto-sysfs.c | |
| parent | block: fix error unwinding in blk_register_queue (diff) | |
| download | linux-2bd85221a625b316114bafaab527770b607095d3.tar.xz linux-2bd85221a625b316114bafaab527770b607095d3.zip | |
block: untangle request_queue refcounting from sysfs
The kobject embedded into the request_queue is used for the queue
directory in sysfs, but that is a child of the gendisks directory and is
intimately tied to it. Move this kobject to the gendisk and use a
refcount_t in the request_queue for the actual request_queue refcounting
that is completely unrelated to the device model.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221114042637.1009333-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-crypto-sysfs.c')
| -rw-r--r-- | block/blk-crypto-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-crypto-sysfs.c b/block/blk-crypto-sysfs.c index e05f145cd797..55268edc0625 100644 --- a/block/blk-crypto-sysfs.c +++ b/block/blk-crypto-sysfs.c @@ -140,8 +140,8 @@ int blk_crypto_sysfs_register(struct gendisk *disk) return -ENOMEM; obj->profile = q->crypto_profile; - err = kobject_init_and_add(&obj->kobj, &blk_crypto_ktype, &q->kobj, - "crypto"); + err = kobject_init_and_add(&obj->kobj, &blk_crypto_ktype, + &disk->queue_kobj, "crypto"); if (err) { kobject_put(&obj->kobj); return err; |