Commit f5ec592d authored by Eric Biggers's avatar Eric Biggers Committed by Jens Axboe
Browse files

block: simplify calling convention of elv_unregister_queue() 



Make elv_unregister_queue() a no-op if q->elevator is NULL or is not
registered.

This simplifies the existing callers, as well as the future caller in
the error path of blk_register_queue().

Also don't bother checking whether q is NULL, since it never is.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220124215938.2769-2-ebiggers@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 483546c1

block/blk-sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ void blk_unregister_queue(struct gendisk *disk) 
	blk_trace_remove_sysfs(disk_to_dev(disk));



	mutex_lock(&q->sysfs_lock);

	if (q->elevator)

	elv_unregister_queue(q);

	disk_unregister_independent_access_ranges(disk);

	mutex_unlock(&q->sysfs_lock);

block/elevator.c

+4 −4
Original line number Diff line number Diff line
@@ -516,9 +516,11 @@ int elv_register_queue(struct request_queue *q, bool uevent) 


void elv_unregister_queue(struct request_queue *q)

{

	struct elevator_queue *e = q->elevator;



	lockdep_assert_held(&q->sysfs_lock);



	if (q) {

	if (e && e->registered) {

		struct elevator_queue *e = q->elevator;



		kobject_uevent(&e->kobj, KOBJ_REMOVE);
@@ -593,9 +595,7 @@ int elevator_switch_mq(struct request_queue *q, 
	lockdep_assert_held(&q->sysfs_lock);



	if (q->elevator) {

		if (q->elevator->registered)

		elv_unregister_queue(q);



		ioc_clear_queue(q);

		blk_mq_sched_free_rqs(q);

		elevator_exit(q);