---

yaml --- r: 101208 b: refs/heads/master c: 52a93ba h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · a1ff451 · a1ff451
1 parent a3c2a2b
commit a1ff451
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d79c5a670ddf076a346ddcf3d9e21785ecab963f
+refs/heads/master: 52a93ba815737e3877f85b46850cffe993a22429
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1042,15 +1042,9 @@ void blk_put_request(struct request *req)
 	unsigned long flags;
 	struct request_queue *q = req->q;
 
-	/*
-	 * Gee, IDE calls in w/ NULL q.  Fix IDE and remove the
-	 * following if (q) test.
-	 */
-	if (q) {
-		spin_lock_irqsave(q->queue_lock, flags);
-		__blk_put_request(q, req);
-		spin_unlock_irqrestore(q->queue_lock, flags);
-	}
+	spin_lock_irqsave(q->queue_lock, flags);
+	__blk_put_request(q, req);
+	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 EXPORT_SYMBOL(blk_put_request);