block: make blk_abort_queue() ignore non-request based devices

[~andy/linux] / block / blk-timeout.c

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index bbbdc4b8ccf27a9d0d1f4a9648a930b89f8761a0..8f570c4c80ee822538344ef4bbcb8a94cc3ebff2 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);