Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk/linux

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

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 059467086b13123b26630c1e84942980f3001216..4b1a35ab0ea4c9c73a910a8c7454bb9ca2229881 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 */
@@ -1444,14 +1443,8 @@ int blkcg_init_disk(struct gendisk *disk)
        if (ret)
                goto err_destroy_all;
 
-       ret = blk_throtl_init(disk);
-       if (ret)
-               goto err_ioprio_exit;
-
        return 0;
 
-err_ioprio_exit:
-       blk_ioprio_exit(disk);
 err_destroy_all:
        blkg_destroy_all(disk);
        return ret;