diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:07:59 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:07:59 -0700 |
| commit | 9abd59b0df155835a970c2b9c8f93367eb793797 (patch) | |
| tree | bcf0868f831d204e2b582113c53b8de3ff015eca /block | |
| parent | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (diff) | |
| parent | 94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff) | |
| download | kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.zip kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.tar.gz kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.tar.bz2 | |
Merge commit 'v3.0.1' into android-3.0
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 3 | ||||
| -rw-r--r-- | block/blk-exec.c | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index d2f8f40..1d49e1c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -839,6 +839,9 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask) { struct request *rq; + if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) + return NULL; + BUG_ON(rw != READ && rw != WRITE); spin_lock_irq(q->queue_lock); diff --git a/block/blk-exec.c b/block/blk-exec.c index 8a0e7ec..a1ebceb 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, { int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; + if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) { + rq->errors = -ENXIO; + if (rq->end_io) + rq->end_io(rq, rq->errors); + return; + } + rq->rq_disk = bd_disk; rq->end_io = done; WARN_ON(irqs_disabled()); |