From 06eff4a85f32b7f362c3daec8bf09a1371a38ed7 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Fri, 1 Oct 2010 14:49:44 +0200 Subject: [PATCH] --- yaml --- r: 213061 b: refs/heads/master c: 61014e96e6ed55b8db0af31574eec2a75d4e8755 h: refs/heads/master i: 213059: 3589ec12202129fb09ba7bcf2f0bb8522b0edc57 v: v3 --- [refs] | 2 +- trunk/block/blk-cgroup.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2929bdfe6856..bb3e25f57a7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13f98250f587b7defa39ed738dfa74b600e46e7b +refs/heads/master: 61014e96e6ed55b8db0af31574eec2a75d4e8755 diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c index 86e7066a0b62..b06ca70354e3 100644 --- a/trunk/block/blk-cgroup.c +++ b/trunk/block/blk-cgroup.c @@ -1411,13 +1411,14 @@ static void blkiocg_destroy(struct cgroup_subsys *subsys, struct cgroup *cgroup) /* * This blkio_group is being unlinked as associated cgroup is * going away. Let all the IO controlling policies know about - * this event. Currently this is static call to one io - * controlling policy. Once we have more policies in place, we - * need some dynamic registration of callback function. + * this event. */ spin_lock(&blkio_list_lock); - list_for_each_entry(blkiop, &blkio_list, list) + list_for_each_entry(blkiop, &blkio_list, list) { + if (blkiop->plid != blkg->plid) + continue; blkiop->ops.blkio_unlink_group_fn(key, blkg); + } spin_unlock(&blkio_list_lock); } while (1);