diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-04-17 08:36:50 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-04-22 08:35:10 +0200 |
| commit | b759113499d6c7cb75fab04f56772579308bc0f8 (patch) | |
| tree | d36a0ea295f675bd678ee30e8191c0358cfc5b74 /block | |
| parent | 71982a409f12c50d011325a4471aa20666bb908d (diff) | |
| download | kernel_samsung_aries-b759113499d6c7cb75fab04f56772579308bc0f8.zip kernel_samsung_aries-b759113499d6c7cb75fab04f56772579308bc0f8.tar.gz kernel_samsung_aries-b759113499d6c7cb75fab04f56772579308bc0f8.tar.bz2 | |
block: make blk_abort_queue() ignore non-request based devices
There's nothing to do for those devices, since the timeout handling is
based on requests.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-timeout.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index bbbdc4b..8f570c4 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -211,6 +211,12 @@ void blk_abort_queue(struct request_queue *q) struct request *rq, *tmp; LIST_HEAD(list); + /* + * Not a request based block device, nothing to abort + */ + if (!q->request_fn) + return; + spin_lock_irqsave(q->queue_lock, flags); elv_abort_queue(q); |