Commit 3aa72873 authored Apr 21, 2011 by Jens Axboe

elevator: check for ELEVATOR_INSERT_SORT_MERGE in !elvpriv case too



The sort insert is the one that goes to the IO scheduler. With
the SORT_MERGE addition, we could bypass IO scheduler setup
but still ask the IO scheduler to insert the request. This would
cause an oops on switching IO schedulers through the sysfs
interface, unless the disk just happened to be idle while it
occured.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parent 584f7904

block/elevator.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -671,7 +671,8 @@ void __elv_add_request(struct request_queue q, struct request rq, int where)
		q->boundary_rq = rq;
		}
		} else if (!(rq->cmd_flags & REQ_ELVPRIV) &&
		where == ELEVATOR_INSERT_SORT)
		(where == ELEVATOR_INSERT_SORT \|\|
		where == ELEVATOR_INSERT_SORT_MERGE))
		where = ELEVATOR_INSERT_BACK;

		switch (where) {

Admin message