aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-mpath-rdac.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
committerPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
commit35438c4327df18dbf5e7f597b69299119f4a14de (patch)
treea4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/md/dm-mpath-rdac.c
parent2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff)
parentb07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff)
downloadkernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.zip
kernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz
kernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.tar.bz2
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/md/dm-mpath-rdac.c')
-rw-r--r--drivers/md/dm-mpath-rdac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 8b776b8..16b1613 100644
--- 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;
}