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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Jun 2011 00:31:42 +0000 (09:31 +0900)
commit294319fea7169f8a4abb48b1e9b3b98c7334e465
tree761b6153591b89cc63c2d5a57a8d301e4bb0477a
parent071f305d6f2ecd2239f148858ead57a2f4fb16d9
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>
block/blk.h