cgroups: s/cg_mount_in_cgroup_namespace()/cgroupfs_mount()/g

parent 6cc501f3
...@@ -1848,10 +1848,9 @@ static int __cg_mount_direct(int cg_flags, struct hierarchy *h, ...@@ -1848,10 +1848,9 @@ static int __cg_mount_direct(int cg_flags, struct hierarchy *h,
return 0; return 0;
} }
static inline int cg_mount_in_cgroup_namespace(int cg_flags, struct hierarchy *h, static inline int cgroupfs_mount(int cg_flags, struct hierarchy *h,
struct lxc_rootfs *rootfs, struct lxc_rootfs *rootfs,
int dfd_mnt_cgroupfs, int dfd_mnt_cgroupfs, const char *hierarchy_mnt)
const char *hierarchy_mnt)
{ {
return __cg_mount_direct(cg_flags, h, rootfs, dfd_mnt_cgroupfs, hierarchy_mnt); return __cg_mount_direct(cg_flags, h, rootfs, dfd_mnt_cgroupfs, hierarchy_mnt);
} }
...@@ -1941,7 +1940,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops, ...@@ -1941,7 +1940,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
* the cgroups manually. * the cgroups manually.
*/ */
if (in_cgroup_ns && wants_force_mount) if (in_cgroup_ns && wants_force_mount)
ret = cg_mount_in_cgroup_namespace(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, ""); ret = cgroupfs_mount(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, "");
else else
ret = cg_mount_cgroup_full(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, ""); ret = cg_mount_cgroup_full(cg_flags, ops->unified, rootfs, dfd_mnt_cgroupfs, "");
if (ret < 0) if (ret < 0)
...@@ -2013,7 +2012,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops, ...@@ -2013,7 +2012,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
* will not have CAP_SYS_ADMIN after it has started we * will not have CAP_SYS_ADMIN after it has started we
* need to mount the cgroups manually. * need to mount the cgroups manually.
*/ */
ret = cg_mount_in_cgroup_namespace(cg_flags, h, rootfs, dfd_mnt_cgroupfs, controller); ret = cgroupfs_mount(cg_flags, h, rootfs, dfd_mnt_cgroupfs, controller);
if (ret < 0) if (ret < 0)
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment