From 1411165033c4085c3ed1c1fef4657532ebf0821f Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 15 Feb 2021 13:44:24 +0100 Subject: [PATCH] cgroups: s/cg_mount_cgroup_full()/cgroupfs_bind_mount()/g Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 182e11064..4974303bc 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -1855,10 +1855,10 @@ static inline int cgroupfs_mount(int cg_flags, struct hierarchy *h, return __cg_mount_direct(cg_flags, h, rootfs, dfd_mnt_cgroupfs, hierarchy_mnt); } -static inline int cg_mount_cgroup_full(int cg_flags, struct hierarchy *h, - struct lxc_rootfs *rootfs, - int dfd_mnt_cgroupfs, - const char *hierarchy_mnt) +static inline int cgroupfs_bind_mount(int cg_flags, struct hierarchy *h, + struct lxc_rootfs *rootfs, + int dfd_mnt_cgroupfs, + const char *hierarchy_mnt) { if (!(cg_flags & LXC_AUTO_CGROUP_FULL_RO) && !(cg_flags & LXC_AUTO_CGROUP_FULL_MIXED)) @@ -1942,7 +1942,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops, if (in_cgroup_ns && wants_force_mount) ret = cgroupfs_mount(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, ""); else - ret = cg_mount_cgroup_full(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, ""); + ret = cgroupfs_bind_mount(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, ""); if (ret < 0) return syserrno(false, "Failed to%s mount cgroup filesystem%s", wants_force_mount ? " force mount" : "", @@ -2020,7 +2020,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops, } /* Here is where the ancient kernel section begins. */ - ret = cg_mount_cgroup_full(cg_flags, h, rootfs, dfd_mnt_cgroupfs, controller); + ret = cgroupfs_bind_mount(cg_flags, h, rootfs, dfd_mnt_cgroupfs, controller); if (ret < 0) return false; -- 2.47.2