diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2011-05-18 16:20:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-23 15:28:34 -0700 |
| commit | a5d866de77d0b883830a0bff0d6d99a7426647d7 (patch) | |
| tree | 8a8a55ed6b3ba8dca2f708867df8bd3e7ce3e4f9 /block | |
| parent | 6f31747bfeb8c74e6d0a10ecef0abe2a04c5a6cb (diff) | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index 5ee3d7e72fe..14148369514 100644 --- a/block/blk.h +++ b/block/blk.h @@ -62,7 +62,8 @@ static inline struct request *__elv_next_request(struct request_queue *q) return rq; } - if (!q->elevator->ops->elevator_dispatch_fn(q, 0)) + if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) || + !q->elevator->ops->elevator_dispatch_fn(q, 0)) return NULL; } } |