diff options
author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-05-11 11:25:38 +0000 |
---|---|---|
committer | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-05-11 11:25:38 +0000 |
commit | 33cb18caa7316170781e0b2ec1dd362d99500df2 (patch) | |
tree | cb368edd08dfbfdbdb6cf1e44542a8e59e11820f /api.c | |
parent | 96baa975d749de2580fd352473b8dde81e081f08 (diff) | |
download | libcg-33cb18caa7316170781e0b2ec1dd362d99500df2.tar.gz libcg-33cb18caa7316170781e0b2ec1dd362d99500df2.tar.xz libcg-33cb18caa7316170781e0b2ec1dd362d99500df2.zip |
Remove merge comments and left overs from previous merge
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/branches/balbir@27 4f4bb910-9a46-0410-90c8-c897d4f1cd53
Diffstat (limited to 'api.c')
-rw-r--r-- | api.c | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -361,16 +361,9 @@ int cg_create_cgroup(struct cgroup *cgroup, int ignore_ownership) strcpy(base, path); -<<<<<<< .mine if (!ignore_ownership) cg_chown_recursive(fts_path, cgroup->control_uid, cgroup->control_gid); -======= - if (!ignore_ownership) - error = cg_chown_recursive(fts_path, cgroup->control_uid, - cgroup->control_gid); ->>>>>>> .r18 - if (error) goto err; @@ -406,11 +399,7 @@ err: * * returns 0 on success. */ -<<<<<<< .mine -int cg_delete_cgroup(struct cgroup *cgroup, int ignore_tasks) -======= int cg_delete_cgroup(struct cgroup *cgroup, int ignore_migration) ->>>>>>> .r18 { FILE *delete_tasks, *base_tasks; int tids; @@ -443,11 +432,7 @@ int cg_delete_cgroup(struct cgroup *cgroup, int ignore_migration) del_open_err: fclose(base_tasks); base_open_err: -<<<<<<< .mine - if (ignore_tasks) { -======= if (ignore_migration) { ->>>>>>> .r18 cg_build_path(cgroup->name, path); error = rmdir(path); } |