---

yaml --- r: 10902 b: refs/heads/master c: 47e627c h: refs/heads/master v: v3
git-mirror · Oct 29, 2005 · 910ce0c · 910ce0c
1 parent b13b7aa
commit 910ce0c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc228a04a4c01bbb2f898e180a14f9a976001f79
+refs/heads/master: 47e627ce83b6df9f4bb8e4b0a4dde1c5d7a4c929
diff --git a/trunk/drivers/block/as-iosched.c b/trunk/drivers/block/as-iosched.c
@@ -1344,6 +1344,7 @@ as_add_aliased_request(struct as_data *ad, struct as_rq *arq, struct as_rq *alia
 	 * Don't want to have to handle merges.
 	 */
 	as_del_arq_hash(arq);
+	arq->request->flags |= REQ_NOMERGE;
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up @@
     	 * Don't want to have to handle merges.
     	 */
     	as_del_arq_hash(arq);
+    	arq->request->flags |= REQ_NOMERGE;
     }
     /*
@@ Expand Down @@