Revert "blk-cgroup: dropping parent refcount after pd_free_fn() is done"
This reverts commit029f1f1efa
which is commitc7241babf0
upstream. It is reported to cause problems, as only 2 of the 3 patch series were applied to the stable branches. Reported-by: Mike Cloaked <mike.cloaked@gmail.com> Reported-by: Eric Biggers <ebiggers@kernel.org> Cc: Yu Kuai <yukuai3@huawei.com> Cc: Tejun Heo <tj@kernel.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Jens Axboe <axboe@kernel.dk> Cc: Sasha Levin <sashal@kernel.org> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217174 Link: https://lore.kernel.org/r/ZAuPkCn49urWBN5P@sol.localdomain Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b5dae1cd0d
commit
deef2947d5
|
@ -93,8 +93,6 @@ static void blkg_free_workfn(struct work_struct *work)
|
|||
if (blkg->pd[i])
|
||||
blkcg_policy[i]->pd_free_fn(blkg->pd[i]);
|
||||
|
||||
if (blkg->parent)
|
||||
blkg_put(blkg->parent);
|
||||
if (blkg->q)
|
||||
blk_put_queue(blkg->q);
|
||||
free_percpu(blkg->iostat_cpu);
|
||||
|
@ -129,6 +127,8 @@ static void __blkg_release(struct rcu_head *rcu)
|
|||
|
||||
/* release the blkcg and parent blkg refs this blkg has been holding */
|
||||
css_put(&blkg->blkcg->css);
|
||||
if (blkg->parent)
|
||||
blkg_put(blkg->parent);
|
||||
blkg_free(blkg);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue