Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2018-10-10 08:12:43 +0200
committerHannes Reinecke <hare@suse.de>2018-10-10 08:29:13 +0200
commitf6acf98e8c457c9ab53dbc4ab3bebb79586081e8 (patch)
tree8b06470b1fe22c091213e3baee2d93752d8669e2
parentd92fd022fda2769bad0a55484b08c747cf9b8aec (diff)
dm-mpath: finally fixup cmd_flags (bsc#1110930).rpm-4.4.156-94.61
-rw-r--r--drivers/md/dm-mpath.c6
-rw-r--r--drivers/md/dm-rq.c1
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 6d116deb2ba4..a01067e01739 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -561,11 +561,7 @@ static int __multipath_map(struct dm_target *ti, struct request *clone,
*/
clone->q = bdev_get_queue(bdev);
clone->rq_disk = bdev->bd_disk;
- if (rq)
- clone->cmd_flags = rq->cmd_flags;
- else
- clone->cmd_flags = 0;
- clone->cmd_flags |= REQ_NOMERGE | REQ_FAILFAST_TRANSPORT;
+ clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
} else {
/*
* blk-mq request-based interface; used by both:
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index a0701a7fd016..d1a93c0e4b9f 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -498,6 +498,7 @@ static int setup_clone(struct request *clone, struct request *rq,
if (r)
return r;
+ clone->cmd_flags = rq->cmd_flags | REQ_NOMERGE;
clone->end_io = end_clone_request;
clone->end_io_data = tio;