blk-cgroup: don't use removal safe list iterators
authorDaniel Vacek <neelx@redhat.com>
Thu, 4 Jan 2024 18:00:30 +0000 (19:00 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 4 Jan 2024 23:07:56 +0000 (16:07 -0700)
Commit f1c006f1c685 moved deletion of the list blkg->q_node from
blkg_destroy() to blkg_free_workfn(). Switch to using the list
iterators, as we don't need removal protection anymore.

Signed-off-by: Daniel Vacek <neelx@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20240104180031.148148-1-neelx@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c

index 58b13ef2382107543f3ce3e3de610482a1a5e6bf..e303fd31731377cae25738cd82beea6b96a4d1b9 100644 (file)
@@ -575,13 +575,13 @@ static void blkg_destroy(struct blkcg_gq *blkg)
 static void blkg_destroy_all(struct gendisk *disk)
 {
        struct request_queue *q = disk->queue;
-       struct blkcg_gq *blkg, *n;
+       struct blkcg_gq *blkg;
        int count = BLKG_DESTROY_BATCH_SIZE;
        int i;
 
 restart:
        spin_lock_irq(&q->queue_lock);
-       list_for_each_entry_safe(blkg, n, &q->blkg_list, q_node) {
+       list_for_each_entry(blkg, &q->blkg_list, q_node) {
                struct blkcg *blkcg = blkg->blkcg;
 
                if (hlist_unhashed(&blkg->blkcg_node))