[PATCH] cgroup: remove extra cgroup_migrate_finish() call

From: Shakeel Butt
Date: Wed Apr 03 2019 - 19:04:14 EST


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@xxxxxxxxxx>
---
kernel/cgroup/cgroup.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 3f2b4bde0f9c..f219c195a9a5 100644
--- 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;
}

/**
--
2.21.0.392.gf8f6787159e-goog