Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
14111650
Unverified
Commit
14111650
authored
Feb 15, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cgroups: s/cg_mount_cgroup_full()/cgroupfs_bind_mount()/g
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
074af890
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
cgfsng.c
src/lxc/cgroups/cgfsng.c
+6
-6
No files found.
src/lxc/cgroups/cgfsng.c
View file @
14111650
...
@@ -1855,10 +1855,10 @@ static inline int cgroupfs_mount(int cg_flags, struct hierarchy *h,
...
@@ -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
);
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
,
static
inline
int
cg
roupfs_bind_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
)
{
{
if
(
!
(
cg_flags
&
LXC_AUTO_CGROUP_FULL_RO
)
&&
if
(
!
(
cg_flags
&
LXC_AUTO_CGROUP_FULL_RO
)
&&
!
(
cg_flags
&
LXC_AUTO_CGROUP_FULL_MIXED
))
!
(
cg_flags
&
LXC_AUTO_CGROUP_FULL_MIXED
))
...
@@ -1942,7 +1942,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
...
@@ -1942,7 +1942,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
if
(
in_cgroup_ns
&&
wants_force_mount
)
if
(
in_cgroup_ns
&&
wants_force_mount
)
ret
=
cgroupfs_mount
(
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
roupfs_bind_mount
(
cg_flags
,
ops
->
unified
,
rootfs
,
dfd_mnt_cgroupfs
,
""
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
syserrno
(
false
,
"Failed to%s mount cgroup filesystem%s"
,
return
syserrno
(
false
,
"Failed to%s mount cgroup filesystem%s"
,
wants_force_mount
?
" force mount"
:
""
,
wants_force_mount
?
" force mount"
:
""
,
...
@@ -2020,7 +2020,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
...
@@ -2020,7 +2020,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
}
}
/* Here is where the ancient kernel section begins. */
/* Here is where the ancient kernel section begins. */
ret
=
cg
_mount_cgroup_full
(
cg_flags
,
h
,
rootfs
,
dfd_mnt_cgroupfs
,
controller
);
ret
=
cg
roupfs_bind_mount
(
cg_flags
,
h
,
rootfs
,
dfd_mnt_cgroupfs
,
controller
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
false
;
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment