From e303833355bd786a5c3e54e39d3a96488142386d Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Mon, 25 Jan 2021 23:56:23 -0800 Subject: [PATCH] oom: shorten xattr name --- src/core/cgroup.c | 2 +- src/oom/oomd-util.c | 4 ++-- src/oom/test-oomd-util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index c9cf7fb16c..70282a7abd 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2746,7 +2746,7 @@ int unit_check_oomd_kill(Unit *u) { else if (r == 0) return 0; - r = cg_get_xattr_malloc(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, "user.systemd_oomd_kill", &value); + r = cg_get_xattr_malloc(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, "user.oomd_kill", &value); if (r < 0 && r != -ENODATA) return r; diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c index fcccddb92e..80b9583440 100644 --- a/src/oom/oomd-util.c +++ b/src/oom/oomd-util.c @@ -201,9 +201,9 @@ int oomd_cgroup_kill(const char *path, bool recurse, bool dry_run) { if (r < 0) return r; - r = increment_oomd_xattr(path, "user.systemd_oomd_kill", set_size(pids_killed)); + r = increment_oomd_xattr(path, "user.oomd_kill", set_size(pids_killed)); if (r < 0) - log_debug_errno(r, "Failed to set user.systemd_oomd_kill on kill: %m"); + log_debug_errno(r, "Failed to set user.oomd_kill on kill: %m"); return set_size(pids_killed) != 0; } diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index 54fe2a03d1..3dec4f0ff0 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-util.c @@ -79,7 +79,7 @@ static void test_oomd_cgroup_kill(void) { sleep(2); assert_se(cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, cgroup) == true); - assert_se(cg_get_xattr_malloc(SYSTEMD_CGROUP_CONTROLLER, cgroup, "user.systemd_oomd_kill", &v) >= 0); + assert_se(cg_get_xattr_malloc(SYSTEMD_CGROUP_CONTROLLER, cgroup, "user.oomd_kill", &v) >= 0); assert_se(memcmp(v, i == 0 ? "2" : "4", 2) == 0); } }