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>
Thu, 23 Jun 2011 22:24:01 +0000 (15:24 -0700)
commit5e4c1dbf52bc1ff33782266332a62151d5b5f0be
treec29f79f3d421cb0b4e76b4ae3ffb472294eafd51
parent5b2745db12a3f97a9ec9efd4ffa077da707d3e4c
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