Skip to content

Commit

Permalink
block: add proper state guards to __elv_next_request
Browse files Browse the repository at this point in the history
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>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
James Bottomley authored and Jens Axboe committed May 18, 2011
1 parent a2b9c1f commit 0a58e07
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion block/blk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 0a58e07

Please sign in to comment.