cgroup: remove extra cgroup_migrate_finish() call

shakeelb · htejun · commit d6e486ee0ef2 · 2019-04-04T13:39:42.000-07:00
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 &lt;shakeelb@google.com&gt;
Reviewed-by: Daniel Jordan &lt;daniel.m.jordan@oracle.com&gt;
Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
@@ -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;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -2602,7 +2602,7 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx)`
`2602`	`2602`
`2603`	`2603`	`dst_cset = find_css_set(src_cset, src_cset->mg_dst_cgrp);`
`2604`	`2604`	`if (!dst_cset)`
`2605`		`- goto err;`
	`2605`	`+ return -ENOMEM;`
`2606`	`2606`
`2607`	`2607`	`WARN_ON_ONCE(src_cset->mg_dst_cset \|\| dst_cset->mg_dst_cset);`
`2608`	`2608`
`@@ -2634,9 +2634,6 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx)`
`2634`	`2634`	`}`
`2635`	`2635`
`2636`	`2636`	`return 0;`
`2637`		`-err:`
`2638`		`- cgroup_migrate_finish(mgctx);`
`2639`		`- return -ENOMEM;`
`2640`	`2637`	`}`
`2641`	`2638`
`2642`	`2639`	`/**`