diff options
| author |   Bart Van Assche <bvanassche@acm.org> | 2019-09-30 16:00:43 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-10-07 08:31:59 -0600 |
| commit | bae85c156f619939ef6261f1bd4fabbe24361b50 (patch) | |
| tree | c84786cb0148d7e0a5d0ded9b903d6bcc5aeadd8 /block/blk-core.c | |
| parent | block: Remove request_queue.nr_queues (diff) | |
| download | wireguard-linux-bae85c156f619939ef6261f1bd4fabbe24361b50.tar.xz wireguard-linux-bae85c156f619939ef6261f1bd4fabbe24361b50.zip | |
block: Remove "dying" checks from sysfs callbacks
Block drivers must call del_gendisk() before blk_cleanup_queue().
del_gendisk() calls kobject_del() and kobject_del() waits until any
ongoing sysfs callback functions have finished. In other words, the
sysfs callback functions won't be called for a queue in the dying
state. Hence remove the "dying" checks from the sysfs callback
functions.
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index d5e668ec751b..8b51d9ec8ae3 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -336,6 +336,8 @@ EXPORT_SYMBOL_GPL(blk_set_queue_dying); */ void blk_cleanup_queue(struct request_queue *q) { + WARN_ON_ONCE(blk_queue_registered(q)); + /* mark @q DYING, no new request or merges will be allowed afterwards */ mutex_lock(&q->sysfs_lock); blk_set_queue_dying(q); |