]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cgroups: s/cg_mount_cgroup_full()/cgroupfs_bind_mount()/g
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 15 Feb 2021 12:44:24 +0000 (13:44 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 15 Feb 2021 12:44:24 +0000 (13:44 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index 182e110640ea2608142efcb8f9449901a71f68c4..4974303bc193810361cf82ed3b8c6800b5e62854 100644 (file)
@@ -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;