---

yaml --- r: 44863 b: refs/heads/master c: bb4067e h: refs/heads/master i: 44861: ee5fda3 44859: b3b2f01 44855: c3101fd 44847: d89a4e8 44831: d9ea2cf 44799: b5ca3ba v: v3
git-mirror · Dec 22, 2006 · 19cb1ea · 19cb1ea
1 parent 7540ea6
commit 19cb1ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))