From 04c36c242a4c3cd817f8ff9e876f3a805606c321 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Thu, 2 Apr 2009 19:55:37 +0100 Subject: [PATCH] --- yaml --- r: 140179 b: refs/heads/master c: 53d5914f288b67ddc4d594d6a09568fe114bb909 h: refs/heads/master i: 140177: f3bd039253180684cf29c076a51c91f74c111b3b 140175: 1602fcdf173b85dfa8b14bc570d7d305c3ed3264 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 2a1fccab66e0..65188c0ab131 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a1fb46448cac50e93115322ad28f417936f7852 +refs/heads/master: 53d5914f288b67ddc4d594d6a09568fe114bb909 diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index f913b507fc81..dac79d11458d 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -99,11 +99,6 @@ union map_info *dm_get_mapinfo(struct bio *bio) /* * Work processed by per-device workqueue. */ -struct dm_wq_req { - struct work_struct work; - struct mapped_device *md; -}; - struct mapped_device { struct rw_semaphore io_lock; struct mutex suspend_lock; @@ -125,6 +120,7 @@ struct mapped_device { */ atomic_t pending; wait_queue_head_t wait; + struct work_struct work; struct bio_list deferred; struct bio_list pushback; @@ -1070,6 +1066,8 @@ static int next_free_minor(int *minor) static struct block_device_operations dm_blk_dops; +static void dm_wq_work(struct work_struct *work); + /* * Allocate and initialise a blank device with a given minor. */ @@ -1136,6 +1134,7 @@ static struct mapped_device *alloc_dev(int minor) atomic_set(&md->pending, 0); init_waitqueue_head(&md->wait); + INIT_WORK(&md->work, dm_wq_work); init_waitqueue_head(&md->eventq); md->disk->major = _major; @@ -1426,26 +1425,17 @@ static void __merge_pushback_list(struct mapped_device *md) static void dm_wq_work(struct work_struct *work) { - struct dm_wq_req *req = container_of(work, struct dm_wq_req, work); - struct mapped_device *md = req->md; + struct mapped_device *md = container_of(work, struct mapped_device, + work); down_write(&md->io_lock); __flush_deferred_io(md); up_write(&md->io_lock); } -static void dm_wq_queue(struct mapped_device *md, struct dm_wq_req *req) -{ - req->md = md; - INIT_WORK(&req->work, dm_wq_work); - queue_work(md->wq, &req->work); -} - static void dm_queue_flush(struct mapped_device *md) { - struct dm_wq_req req; - - dm_wq_queue(md, &req); + queue_work(md->wq, &md->work); flush_workqueue(md->wq); }