aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/device_handler/scsi_dh_alua.c
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2008-09-06 08:39:16 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-10-13 09:28:56 -0400
commit64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d (patch)
treec7e4d7e81b1471a8db9b7e745c07156750abe1e7 /drivers/scsi/device_handler/scsi_dh_alua.c
parentd9cc21fa8caee54e7960114bce8946f563a8fddd (diff)
downloadkernel_samsung_smdk4412-64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d.zip
kernel_samsung_smdk4412-64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d.tar.gz
kernel_samsung_smdk4412-64f84bc1cf49aa5e0c4b945b434e5d4b74e0831d.tar.bz2
[SCSI] scsi_dh_alua: remove REQ_NOMERGE
We do not need to set REQ_NOMERGE because when the module calls blk_execute_rq -> blk_execute_rq_nowait, blk_execute_rq_nowait sets it for us. This brings all the modules in sync for those bits. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_alua.c')
-rw-r--r--drivers/scsi/device_handler/scsi_dh_alua.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index cb8aa3b..e356b43 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/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;