git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
block: make blk_abort_queue() ignore non-request based devices
[safe/jmp/linux-2.6]
/
block
/
blk-timeout.c
diff --git
a/block/blk-timeout.c
b/block/blk-timeout.c
index
bbbdc4b
..
8f570c4
100644
(file)
--- 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);