lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: remove unnecessary struct dm_wq_req

Browse Source 
Remove struct dm_wq_req and move "work" directly into struct mapped_device.

In the revised implementation, the thread will do just one type of work
(processing the queue).

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka
2009-04-02 19:55:37 +01:00
committed by Alasdair G Kergon
parent 9a1fb46448
commit 53d5914f28
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/md/dm.c
View File

@@ -99,11 +99,6 @@ union map_info *dm_get_mapinfo(struct bio *bio)
/* /*
* Work processed by per-device workqueue. * Work processed by per-device workqueue.
*/ */
struct dm_wq_req {
struct work_struct work;
struct mapped_device *md;
};
struct mapped_device { struct mapped_device {
struct rw_semaphore io_lock; struct rw_semaphore io_lock;
struct mutex suspend_lock; struct mutex suspend_lock;
@@ -125,6 +120,7 @@ struct mapped_device {
*/ */
atomic_t pending; atomic_t pending;
wait_queue_head_t wait; wait_queue_head_t wait;
struct work_struct work;
struct bio_list deferred; struct bio_list deferred;
struct bio_list pushback; struct bio_list pushback;
@@ -1070,6 +1066,8 @@ out:
static struct block_device_operations dm_blk_dops; 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. * 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); atomic_set(&md->pending, 0);
init_waitqueue_head(&md->wait); init_waitqueue_head(&md->wait);
INIT_WORK(&md->work, dm_wq_work);
init_waitqueue_head(&md->eventq); init_waitqueue_head(&md->eventq);
md->disk->major = _major; 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) 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 = container_of(work, struct mapped_device,
struct mapped_device *md = req->md; work);
down_write(&md->io_lock); down_write(&md->io_lock);
__flush_deferred_io(md); __flush_deferred_io(md);
up_write(&md->io_lock); 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) static void dm_queue_flush(struct mapped_device *md)
{ {
struct dm_wq_req req; queue_work(md->wq, &md->work);
dm_wq_queue(md, &req);
flush_workqueue(md->wq); flush_workqueue(md->wq);
} }