openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm: merge __flush_deferred_io into caller 

Merge __flush_deferred_io() into the only caller, dm_wq_work().

There's no need to have a function that has only one caller.

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:38 +01:00 committed by Alasdair G Kergon
parent f0b9a4502b
commit ef2085870e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/md/dm.c
View File

@ -1401,14 +1401,20 @@ static int dm_wait_for_completion(struct mapped_device *md)
/*
* Process the deferred bios
*/
static void __flush_deferred_io(struct mapped_device *md)
static void dm_wq_work(struct work_struct *work)
{
struct mapped_device *md = container_of(work, struct mapped_device,
work);
struct bio *c;
down_write(&md->io_lock);
while ((c = bio_list_pop(&md->deferred)))
__split_and_process_bio(md, c);
clear_bit(DMF_BLOCK_IO, &md->flags);
up_write(&md->io_lock);
}
static void __merge_pushback_list(struct mapped_device *md)
@ -1422,16 +1428,6 @@ static void __merge_pushback_list(struct mapped_device *md)
spin_unlock_irqrestore(&md->pushback_lock, flags);
}
static void dm_wq_work(struct work_struct *work)
{
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_queue_flush(struct mapped_device *md)
{
queue_work(md->wq, &md->work);