oomd: wrap paths in oomd_insert_cgroup_context with empty_to_root

diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index fad1fb0d452957e1afb031a1f0660a4b449d1c38..085fc6487fd361a8e5353f3cc376365826f124ea 100644 (file)
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -112,7 +112,7 @@ static int process_managed_oom_reply(
                                 continue;
                 }
 
-                ret = oomd_insert_cgroup_context(NULL, monitor_hm, empty_to_root(reply.path));
+                ret = oomd_insert_cgroup_context(NULL, monitor_hm, reply.path);
                 if (ret == -ENOMEM) {
                         r = ret;
                         goto finish;

diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c
index 82bc9e25291ff73b1f7a682907cb976e5186e6c3..d8dbb750139a762e4e13a98843e7ef4fc4ead973 100644 (file)
--- a/src/oom/oomd-util.c
+++ b/src/oom/oomd-util.c
@@ -390,10 +390,14 @@ int oomd_insert_cgroup_context(Hashmap *old_h, Hashmap *new_h, const char *path)
         assert(new_h);
         assert(path);
 
+        path = empty_to_root(path);
+
         r = oomd_cgroup_context_acquire(path, &curr_ctx);
         if (r < 0)
                 return log_debug_errno(r, "Failed to get OomdCGroupContext for %s: %m", path);
 
+        assert_se(streq(path, curr_ctx->path));
+
         old_ctx = hashmap_get(old_h, path);
         if (old_ctx) {
                 curr_ctx->last_pgscan = old_ctx->pgscan;