|
@@ -110,7 +110,7 @@ static struct request *get_alua_req(struct scsi_device *sdev,
|
|
|
|
|
|
rq->cmd_type = REQ_TYPE_BLOCK_PC;
|
|
rq->cmd_type = REQ_TYPE_BLOCK_PC;
|
|
rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
|
|
rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
|
|
- REQ_FAILFAST_DRIVER | REQ_NOMERGE;
|
|
|
|
|
|
+ REQ_FAILFAST_DRIVER;
|
|
rq->retries = ALUA_FAILOVER_RETRIES;
|
|
rq->retries = ALUA_FAILOVER_RETRIES;
|
|
rq->timeout = ALUA_FAILOVER_TIMEOUT;
|
|
rq->timeout = ALUA_FAILOVER_TIMEOUT;
|
|
|
|
|