From d3e8277d5004163c725a895778c3a9dce9ca091e Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 1 Feb 2017 20:26:58 -0500 Subject: cgtop: use common function to query cgroup root show_cgroup_get_root_and_warn is renamed to show_cgroup_get_path_and_warn because it now optionally allows querying a non-root path. This removes duplicated code and teaches cgtop to combine -M with a root prefix: $ systemd-cgtop -M myprecious /system.slice ... --- src/cgls/cgls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cgls') diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index e6ec9640a8..1d21c1c20c 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *root = NULL; int i; - r = show_cgroup_get_root_and_warn(arg_machine, &root); + r = show_cgroup_get_path_and_warn(arg_machine, NULL, &root); if (r < 0) goto finish; @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) { if (!done) { _cleanup_free_ char *root = NULL; - r = show_cgroup_get_root_and_warn(arg_machine, &root); + r = show_cgroup_get_path_and_warn(arg_machine, NULL, &root); if (r < 0) goto finish; -- cgit v1.2.3-54-g00ecf