Commit a322baad authored by Arianna Avanzini's avatar Arianna Avanzini Committed by Jens Axboe

block/blk-cgroup.c: free per-blkcg data when freeing the blkcg

Currently, per-blkcg data is freed each time a policy is deactivated,
that is also upon scheduler switch. However, when switching from a
scheduler implementing a policy which requires per-blkcg data to
another one, that same policy might be active on other devices, and
therefore those same per-blkcg data could be still in use.
This commit lets per-blkcg data be freed when the blkcg is freed
instead of on policy deactivation.
Signed-off-by: default avatarArianna Avanzini <>
Reported-and-tested-by: default avatarMichael Kaminsky <>
Fixes: e48453c3 ("block, cgroup: implement policy-specific per-blkcg data")
Signed-off-by: default avatarJens Axboe <>
parent 0762b23d
......@@ -822,8 +822,13 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
struct blkcg *blkcg = css_to_blkcg(css);
if (blkcg != &blkcg_root)
if (blkcg != &blkcg_root) {
int i;
for (i = 0; i < BLKCG_MAX_POLS; i++)
static struct cgroup_subsys_state *
......@@ -1162,8 +1167,6 @@ void blkcg_deactivate_policy(struct request_queue *q,
blkg->pd[pol->plid] = NULL;
blkg->blkcg->pd[pol->plid] = NULL;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment