Skip to content
Snippets Groups Projects
Commit c4451a1f authored by Morris Jette's avatar Morris Jette
Browse files

Cosmetic changes, no logic changes

parent ae323e27
No related branches found
No related tags found
No related merge requests found
...@@ -383,7 +383,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job) ...@@ -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 * a task. The release_agent will have to lock the root memory cgroup
* to avoid this scenario. * 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"); error("task/cgroup: unable to create root memory xcgroup");
return SLURM_ERROR; return SLURM_ERROR;
} }
...@@ -403,7 +403,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job) ...@@ -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 * are not working well so it will be really difficult to manage
* addition/removal of memory amounts at this level. (kernel 2.6.34) * 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, user_cgroup_path,
getuid(),getgid()) != XCGROUP_SUCCESS) { getuid(),getgid()) != XCGROUP_SUCCESS) {
goto error; goto error;
...@@ -412,7 +412,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job) ...@@ -412,7 +412,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
xcgroup_destroy(&user_memory_cg); xcgroup_destroy(&user_memory_cg);
goto error; 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 ) { != XCGROUP_SUCCESS ) {
error("task/cgroup: unable to ask for hierarchical accounting" error("task/cgroup: unable to ask for hierarchical accounting"
"of user memcg '%s'",user_memory_cg.path); "of user memcg '%s'",user_memory_cg.path);
......
...@@ -466,7 +466,7 @@ int xcgroup_instanciate(xcgroup_t* cg) ...@@ -466,7 +466,7 @@ int xcgroup_instanciate(xcgroup_t* cg)
file_path = cg->path; file_path = cg->path;
uid = cg->uid; uid = cg->uid;
gid = cg->gid; gid = cg->gid;
create_only=0; create_only = 0;
notify = cg->notify; notify = cg->notify;
/* save current mask and apply working one */ /* save current mask and apply working one */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment