Commit 64f84bc1 authored Sep 06, 2008 by Mike Christie Committed by James Bottomley Oct 13, 2008

[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>

parent d9cc21fa

drivers/scsi/device_handler/scsi_dh_alua.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;