Commit d6e486ee authored Apr 03, 2019 by Shakeel Butt Committed by Tejun Heo Apr 04, 2019

cgroup: remove extra cgroup_migrate_finish() call



The callers of cgroup_migrate_prepare_dst() correctly call
cgroup_migrate_finish() for success and failure cases both. No need to
call it in cgroup_migrate_prepare_dst() in failure case.

Signed-off-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

parent 145f47c7

kernel/cgroup/cgroup.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2602,7 +2602,7 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx)

		dst_cset = find_css_set(src_cset, src_cset->mg_dst_cgrp);
		if (!dst_cset)
		goto err;
		return -ENOMEM;

		WARN_ON_ONCE(src_cset->mg_dst_cset \|\| dst_cset->mg_dst_cset);

		@@ -2634,9 +2634,6 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx)
		}

		return 0;
		err:
		cgroup_migrate_finish(mgctx);
		return -ENOMEM;
		}

		/**

Admin message