From ef0401ef821dddc629e7365693d612278cc6fa66 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Sat, 6 Sep 2008 08:39:16 -0500 Subject: [PATCH] --- yaml --- r: 115459 b: refs/heads/master c: 64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d h: refs/heads/master i: 115457: 0ac4905b984415aea1c3a0032238a0d246517e5e 115455: 316cdde86a2dde08a9bbf0b1e6a22fd1df3ff736 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c96574af8703..c4a95dd1046d 100644 --- 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 index cb8aa3b58c22..e356b43753ff 100644 --- 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;