From 780797055f31345b901dbe39ac694a03c86ae59e Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sat, 3 Jul 2010 17:45:37 +0900 Subject: [PATCH] --- yaml --- r: 208252 b: refs/heads/master c: 144d6ed551ce430084489b198826c89bac5680dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index cf52a1b1d0ea..db0e55a5f7f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98d8c8f40ed72d997e50bc107a5cc1a6cee19e76 +refs/heads/master: 144d6ed551ce430084489b198826c89bac5680dc diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index d6f77baeafd6..00c810551814 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -1455,20 +1455,9 @@ static int dm_request(struct request_queue *q, struct bio *bio) return _dm_request(q, bio); } -/* - * Mark this request as flush request, so that dm_request_fn() can - * recognize. - */ -static void dm_rq_prepare_flush(struct request_queue *q, struct request *rq) -{ - rq->cmd_type = REQ_TYPE_LINUX_BLOCK; - rq->cmd[0] = REQ_LB_OP_FLUSH; -} - static bool dm_rq_is_flush_request(struct request *rq) { - if (rq->cmd_type == REQ_TYPE_LINUX_BLOCK && - rq->cmd[0] == REQ_LB_OP_FLUSH) + if (rq->cmd_flags & REQ_FLUSH) return true; else return false; @@ -1912,8 +1901,7 @@ static struct mapped_device *alloc_dev(int minor) blk_queue_softirq_done(md->queue, dm_softirq_done); blk_queue_prep_rq(md->queue, dm_prep_fn); blk_queue_lld_busy(md->queue, dm_lld_busy); - blk_queue_ordered(md->queue, QUEUE_ORDERED_DRAIN_FLUSH, - dm_rq_prepare_flush); + blk_queue_ordered(md->queue, QUEUE_ORDERED_DRAIN_FLUSH, NULL); md->disk = alloc_disk(1); if (!md->disk)