Skip to content

Commit f0c6ae0

Browse files
Yufen Yuaxboe
authored andcommitted
block: fix comment and add lockdep assert
After commit b89f625 ("block: don't release queue's sysfs lock during switching elevator"), whole elevator register and unregister function are covered by sysfs_lock. So, remove wrong comment and add lockdep assert. Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 0841031 commit f0c6ae0

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

block/elevator.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -479,16 +479,13 @@ static struct kobj_type elv_ktype = {
479479
.release = elevator_release,
480480
};
481481

482-
/*
483-
* elv_register_queue is called from either blk_register_queue or
484-
* elevator_switch, elevator switch is prevented from being happen
485-
* in the two paths, so it is safe to not hold q->sysfs_lock.
486-
*/
487482
int elv_register_queue(struct request_queue *q, bool uevent)
488483
{
489484
struct elevator_queue *e = q->elevator;
490485
int error;
491486

487+
lockdep_assert_held(&q->sysfs_lock);
488+
492489
error = kobject_add(&e->kobj, &q->kobj, "%s", "iosched");
493490
if (!error) {
494491
struct elv_fs_entry *attr = e->type->elevator_attrs;
@@ -507,13 +504,10 @@ int elv_register_queue(struct request_queue *q, bool uevent)
507504
return error;
508505
}
509506

510-
/*
511-
* elv_unregister_queue is called from either blk_unregister_queue or
512-
* elevator_switch, elevator switch is prevented from being happen
513-
* in the two paths, so it is safe to not hold q->sysfs_lock.
514-
*/
515507
void elv_unregister_queue(struct request_queue *q)
516508
{
509+
lockdep_assert_held(&q->sysfs_lock);
510+
517511
if (q) {
518512
struct elevator_queue *e = q->elevator;
519513

0 commit comments

Comments
 (0)