From 05afa054521e21145258c84d183d8078e20a9a8d Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 17 Apr 2009 08:36:50 +0200
Subject: [PATCH] --- yaml --- r: 143964 b: refs/heads/master c:
 b759113499d6c7cb75fab04f56772579308bc0f8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/blk-timeout.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 702b16c0b2ce..c9f2dfe1d1d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71982a409f12c50d011325a4471aa20666bb908d
+refs/heads/master: b759113499d6c7cb75fab04f56772579308bc0f8
diff --git a/trunk/block/blk-timeout.c b/trunk/block/blk-timeout.c
index bbbdc4b8ccf2..8f570c4c80ee 100644
--- a/trunk/block/blk-timeout.c
+++ b/trunk/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);