elevator: check for ELEVATOR_INSERT_SORT_MERGE in !elvpriv case too
authorJens Axboe <jaxboe@fusionio.com>
Thu, 21 Apr 2011 17:28:35 +0000 (19:28 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 21 Apr 2011 17:28:35 +0000 (19:28 +0200)
commit3aa72873ffdcc2f7919743efbbefc351ec73f5cb
treef159c777a489c6ac3721ba1f1cadbe2d86b19fa5
parent584f79046780e10cb24367a691f8c28398a00e84
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>
block/elevator.c