---

yaml --- r: 115459 b: refs/heads/master c: 64f84bc h: refs/heads/master i: 115457: 0ac4905 115455: 316cdde v: v3
git-mirror · Oct 13, 2008 · ef0401e · ef0401e
1 parent ceac628
commit ef0401e
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: d9cc21fa8caee54e7960114bce8946f563a8fddd
+refs/heads/master: 64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d
diff --git a/trunk/drivers/scsi/device_handler/scsi_dh_alua.c b/trunk/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -110,7 +110,7 @@ static struct request *get_alua_req(struct scsi_device *sdev,
 
 	rq->cmd_type = REQ_TYPE_BLOCK_PC;
 	rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
-			 REQ_FAILFAST_DRIVER | REQ_NOMERGE;
+			 REQ_FAILFAST_DRIVER;
 	rq->retries = ALUA_FAILOVER_RETRIES;
 	rq->timeout = ALUA_FAILOVER_TIMEOUT;