dm-mpath-rdac: don't stomp on a requests transfer bit

Without this, we get qla2xxx complaining about "ISP System Error".

What's happening here is the firmware is detecting a Xfer-ready from the
storage when in fact the data-direction for a mode-select should be a
write (DATA_OUT).

The following patch fixes the problem (typo). Verified by Brian, as
well.

Signed-off-by: Andrew Vasquez <[email protected]>
Verified-by: Brian De Wolf <[email protected]>
Signed-off-by: Chandra Seetharaman <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 8b776b8cb7f7029c6997d2e54e31076a5adc6f54..16b1613457750e990c131592ff4501d5f9de0724 100644 (file)
--- a/drivers/md/dm-mpath-rdac.c
+++ b/drivers/md/dm-mpath-rdac.c
@@ -292,7 +292,7 @@ static struct request *get_rdac_req(struct rdac_handler *h,
        rq->end_io_data = h;
        rq->timeout = h->timeout;
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-       rq->cmd_flags = REQ_FAILFAST | REQ_NOMERGE;
+       rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
        return rq;
 }