summaryrefslogtreecommitdiffstats
path: root/block/blk.h
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2011-05-18 16:20:10 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-05-18 19:30:32 +0200
commit0a58e077eb600d1efd7e54ad9926a75a39d7f8ae (patch)
treeeb1b325d28c0aa44b1dba3bdb0b31b662b2a1f7f /block/blk.h
parenta2b9c1f6208126e6df6c02428c501f8853685812 (diff)
block: add proper state guards to __elv_next_request
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>
Diffstat (limited to 'block/blk.h')
-rw-r--r--block/blk.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h
index 61263463e38..4df474d37e6 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;
}
}