From b9418787e16dd90dd68578e3eebc82d1ca8c0a80 Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Thu, 10 Dec 2009 23:52:14 +0000 Subject: [PATCH] --- yaml --- r: 176543 b: refs/heads/master c: 598de40947909e6b948569710383661ecc0ddc8e h: refs/heads/master i: 176541: 44b5b099147bd49013ec2881e36db8f2d81a390d 176539: 8aba79258d45a68764cae15f2625c973a2fb5a53 176535: a9304df755157b8aded6e5802272a2d8acfe39bf 176527: d993c061eb9616f4c9eb4751557e36d9c6743fcc 176511: 4bc4b1153cecf3413387717cdfd7f8112a4bf680 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 80fbe2449676..ac1b95771b02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90abb8c4cec8f0aa4ce58790542e3cf13071601a +refs/heads/master: 598de40947909e6b948569710383661ecc0ddc8e diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index 73b89afd6565..cf0b455b21ef 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -1495,11 +1495,10 @@ static int dm_prep_fn(struct request_queue *q, struct request *rq) return BLKPREP_OK; } -static void map_request(struct dm_target *ti, struct request *rq, +static void map_request(struct dm_target *ti, struct request *clone, struct mapped_device *md) { int r; - struct request *clone = rq->special; struct dm_rq_target_io *tio = clone->end_io_data; /* @@ -1576,7 +1575,7 @@ static void dm_request_fn(struct request_queue *q) blk_start_request(rq); spin_unlock(q->queue_lock); - map_request(ti, rq, md); + map_request(ti, rq->special, md); spin_lock_irq(q->queue_lock); }