Commit fab4c16c authored by Daniel Vacek's avatar Daniel Vacek Committed by Jens Axboe
Browse files

blk-cgroup: don't use removal safe list iterators 



Commit f1c006f1 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: default avatarDaniel Vacek <neelx@redhat.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20240104180031.148148-1-neelx@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 458aa1a0

block/blk-cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -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))