From 19cb1eab7874b15d4ebf88f3aca9e7fdffc770a4 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 21 Dec 2006 21:20:01 +0100
Subject: [PATCH] --- yaml --- r: 44863 b: refs/heads/master c:
 bb4067e34159648d394943d5e2a011f838bff22f h: refs/heads/master i:   44861:
 ee5fda3177b8d3ff6ca0ca06a5bbdda17cabd77f   44859:
 b3b2f01e8c3b04f9fb01a19b160c5de10a7f18a0   44855:
 c3101fda3b1616c6e664d2a23f59c68c81a4baf3   44847:
 d89a4e844b1b3d4b980c164687050c780cf261d4   44831:
 d9ea2cff10eadb0ae30c721b482bace5dc82781c   44799:
 b5ca3ba330849055f2aaccd3fb7f448eb006bdf2 v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c7a6eb61f7e5..9245347deab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e67c0987d7567ad666641164a153dca9a43b11d
+refs/heads/master: bb4067e34159648d394943d5e2a011f838bff22f
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 62c7a3069d3a..536be740ba4e 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -82,7 +82,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio)
 	/*
 	 * must be same device and not a special request
 	 */
-	if (rq->rq_disk != bio->bi_bdev->bd_disk || !rq->special)
+	if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
 		return 0;
 
 	if (!elv_iosched_allow_merge(rq, bio))