block: add proper state guards to __elv_next_request
authorJames Bottomley <James.Bottomley@suse.de>
Wed, 18 May 2011 14:20:10 +0000 (16:20 +0200)
committerSteve Conklin <sconklin@canonical.com>
Fri, 15 Jul 2011 17:20:51 +0000 (12:20 -0500)
commit0b363265b784f69083033397dff962cd6b25cc4f
tree0f3e4548ecfe7e6e4b998f7039c9ff4da339977a
parent9335a6a2afb9512965e3f601b887fe00479d25f1
block: add proper state guards to __elv_next_request

BugLink: http://bugs.launchpad.net/bugs/793702

commit 0a58e077eb600d1efd7e54ad9926a75a39d7f8ae upstream.

blk_cleanup_queue() calls elevator_exit() and after this, we can't
touch the elevator without oopsing.  __elv_next_request() must check
for this state because in the refcounted queue model, we can still
call it after blk_cleanup_queue() has been called.

This was reported as causing an oops attributable to scsi.

Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
block/blk.h