diff options
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index f3f5cd5e2c0d..a8538e443784 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq, | |||
1342 | if (root != &cgrp_dfl_root) | 1342 | if (root != &cgrp_dfl_root) |
1343 | for_each_subsys(ss, ssid) | 1343 | for_each_subsys(ss, ssid) |
1344 | if (root->subsys_mask & (1 << ssid)) | 1344 | if (root->subsys_mask & (1 << ssid)) |
1345 | seq_printf(seq, ",%s", ss->legacy_name); | 1345 | seq_show_option(seq, ss->name, NULL); |
1346 | if (root->flags & CGRP_ROOT_NOPREFIX) | 1346 | if (root->flags & CGRP_ROOT_NOPREFIX) |
1347 | seq_puts(seq, ",noprefix"); | 1347 | seq_puts(seq, ",noprefix"); |
1348 | if (root->flags & CGRP_ROOT_XATTR) | 1348 | if (root->flags & CGRP_ROOT_XATTR) |
@@ -1350,13 +1350,14 @@ static int cgroup_show_options(struct seq_file *seq, | |||
1350 | 1350 | ||
1351 | spin_lock(&release_agent_path_lock); | 1351 | spin_lock(&release_agent_path_lock); |
1352 | if (strlen(root->release_agent_path)) | 1352 | if (strlen(root->release_agent_path)) |
1353 | seq_printf(seq, ",release_agent=%s", root->release_agent_path); | 1353 | seq_show_option(seq, "release_agent", |
1354 | root->release_agent_path); | ||
1354 | spin_unlock(&release_agent_path_lock); | 1355 | spin_unlock(&release_agent_path_lock); |
1355 | 1356 | ||
1356 | if (test_bit(CGRP_CPUSET_CLONE_CHILDREN, &root->cgrp.flags)) | 1357 | if (test_bit(CGRP_CPUSET_CLONE_CHILDREN, &root->cgrp.flags)) |
1357 | seq_puts(seq, ",clone_children"); | 1358 | seq_puts(seq, ",clone_children"); |
1358 | if (strlen(root->name)) | 1359 | if (strlen(root->name)) |
1359 | seq_printf(seq, ",name=%s", root->name); | 1360 | seq_show_option(seq, "name", root->name); |
1360 | return 0; | 1361 | return 0; |
1361 | } | 1362 | } |
1362 | 1363 | ||