Commit 32757967 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.16-20250725' of git://git.kernel.dk/linux 

Pull block fix from Jens Axboe:
 "Just a single fix for regression in this release, where a module
  reference could be leaked"

* tag 'block-6.16-20250725' of git://git.kernel.dk/linux:
  block: fix module reference leak in mq-deadline I/O scheduler
parents 4bb01220 1966554b

block/elevator.c

+13 −6
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ void elevator_set_default(struct request_queue *q) 
		.name = "mq-deadline",

		.no_uevent = true,

	};

	int err = 0;

	int err;

	struct elevator_type *e;



	/* now we allow to switch elevator */

	blk_queue_flag_clear(QUEUE_FLAG_NO_ELV_SWITCH, q);
@@ -732,12 +733,18 @@ void elevator_set_default(struct request_queue *q) 
	 * have multiple queues or mq-deadline is not available, default

	 * to "none".

	 */

	if (elevator_find_get(ctx.name) && (q->nr_hw_queues == 1 ||

			 blk_mq_is_shared_tags(q->tag_set->flags)))

	e = elevator_find_get(ctx.name);

	if (!e)

		return;



	if ((q->nr_hw_queues == 1 ||

			blk_mq_is_shared_tags(q->tag_set->flags))) {

		err = elevator_change(q, &ctx);

		if (err < 0)

		pr_warn("\"%s\" elevator initialization, failed %d, "

			"falling back to \"none\"\n", ctx.name, err);

			pr_warn("\"%s\" elevator initialization, failed %d, falling back to \"none\"\n",

					ctx.name, err);

	}

	elevator_put(e);

}



void elevator_set_none(struct request_queue *q)