block: add proper state guards to __elv_next_request
commit0871ccb857a76c76be1e4c8b3d1dfdd7f3e91fe7
authorJames Bottomley <James.Bottomley@suse.de>
Wed, 18 May 2011 14:20:10 +0000 (18 16:20 +0200)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:54:50 +0000 (1 13:54 -0700)
tree398135b9950ff54cad9d09e093d1d0e8f8569f28
parent4ede8259d84a843e2adc0ce69523015608a5f271
block: add proper state guards to __elv_next_request

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: Andi Kleen <ak@linux.intel.com>
block/blk.h