blk-cgroup: use bio_list_merge_init

[linux-2.6-block.git] / block / blk-cgroup.c

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index bdbb557feb5a0ec949e7ac8cde0e87b6d4055f5b..8598e4591e7966fe65e7f765005a8e643ab78aa3 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -218,8 +218,7 @@ static void blkg_async_bio_workfn(struct work_struct *work)
 
        /* as long as there are pending bios, @blkg can't go away */
        spin_lock(&blkg->async_bio_lock);
-       bio_list_merge(&bios, &blkg->async_bios);
-       bio_list_init(&blkg->async_bios);
+       bio_list_merge_init(&bios, &blkg->async_bios);
        spin_unlock(&blkg->async_bio_lock);
 
        /* start plug only when bio_list contains at least 2 bios */