From c4451a1f3b5fdce07f1115ab8498dd41eb091017 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 6 Oct 2015 12:55:44 -0700
Subject: [PATCH] Cosmetic changes, no logic changes
---
src/plugins/task/cgroup/task_cgroup_memory.c | 6 +++---
src/slurmd/common/xcgroup.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/task/cgroup/task_cgroup_memory.c b/src/plugins/task/cgroup/task_cgroup_memory.c
index 267a8c42331..a2485d56fb1 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.c
+++ b/src/plugins/task/cgroup/task_cgroup_memory.c
@@ -383,7 +383,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
* a task. The release_agent will have to lock the root memory cgroup
* to avoid this scenario.
*/
- if (xcgroup_create(&memory_ns,&memory_cg,"",0,0) != XCGROUP_SUCCESS) {
+ if (xcgroup_create(&memory_ns, &memory_cg, "",0,0) != XCGROUP_SUCCESS) {
error("task/cgroup: unable to create root memory xcgroup");
return SLURM_ERROR;
}
@@ -403,7 +403,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
* are not working well so it will be really difficult to manage
* addition/removal of memory amounts at this level. (kernel 2.6.34)
*/
- if (xcgroup_create(&memory_ns,&user_memory_cg,
+ if (xcgroup_create(&memory_ns, &user_memory_cg,
user_cgroup_path,
getuid(),getgid()) != XCGROUP_SUCCESS) {
goto error;
@@ -412,7 +412,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
xcgroup_destroy(&user_memory_cg);
goto error;
}
- if ( xcgroup_set_param(&user_memory_cg,"memory.use_hierarchy","1")
+ if ( xcgroup_set_param(&user_memory_cg, "memory.use_hierarchy", "1")
!= XCGROUP_SUCCESS ) {
error("task/cgroup: unable to ask for hierarchical accounting"
"of user memcg '%s'",user_memory_cg.path);
diff --git a/src/slurmd/common/xcgroup.c b/src/slurmd/common/xcgroup.c
index f37bd5d9550..ad4c0655927 100644
--- a/src/slurmd/common/xcgroup.c
+++ b/src/slurmd/common/xcgroup.c
@@ -466,7 +466,7 @@ int xcgroup_instanciate(xcgroup_t* cg)
file_path = cg->path;
uid = cg->uid;
gid = cg->gid;
- create_only=0;
+ create_only = 0;
notify = cg->notify;
/* save current mask and apply working one */
--
GitLab