dm: merge __flush_deferred_io into caller

[linux-2.6-omap-h63xx.git] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 385c2e8f90c81f663810a67ae5a5bc5166ab6b48..4ba0811f28c5bc48be3fe37d23d5aa3f801ece70 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -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);