summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2015-02-09 18:21:54 +0100
committerJens Axboe <axboe@fb.com>2015-02-09 18:46:08 +0100
commitdb507b3ffd9b7a1c87e732ac6e2c3a5d0babb15a (patch)
tree95f5f28682cfb18a4d60c65b1d5551aef4355e27
parentcfq-iosched: handle failure of cfq group allocation (diff)
downloadlinux-db507b3ffd9b7a1c87e732ac6e2c3a5d0babb15a.tar.xz
linux-db507b3ffd9b7a1c87e732ac6e2c3a5d0babb15a.zip
dm: fix multipath regression due to initializing wrong request
Commit febf715 ("block: require blk_rq_prep_clone() be given an initialized clone request") introduced a regression by calling blk_rq_init() on the original request rather than the clone request that is passed to setup_clone(). Signed-off-by: Mike Snitzer <snitzer@redhat.com> Fixes: febf71588c2a ("block: require blk_rq_prep_clone() be given an initialized clone request") Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/md/dm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f251633a51af..71e6b73fe78d 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1719,7 +1719,7 @@ static int setup_clone(struct request *clone, struct request *rq,
{
int r;
- blk_rq_init(NULL, rq);
+ blk_rq_init(NULL, clone);
r = blk_rq_prep_clone(clone, rq, tio->md->bs, GFP_ATOMIC,
dm_rq_bio_constructor, tio);
if (r)