Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Mike Christie and committed by
James Bottomley
64f84bc1 d9cc21fa

+1 -1
+1 -1
drivers/scsi/device_handler/scsi_dh_alua.c
··· 110 110 111 111 rq->cmd_type = REQ_TYPE_BLOCK_PC; 112 112 rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | 113 - REQ_FAILFAST_DRIVER | REQ_NOMERGE; 113 + REQ_FAILFAST_DRIVER; 114 114 rq->retries = ALUA_FAILOVER_RETRIES; 115 115 rq->timeout = ALUA_FAILOVER_TIMEOUT; 116 116