diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-12 00:26:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-12 00:26:22 +0000 |
| commit | 3486648e75a831840219939f41ac89ef64dea0f3 (patch) | |
| tree | a7afe5244eed1fdfc9d3ccb550bf526c45e35a83 /pkg/sentry/fsimpl/cgroupfs/base.go | |
| parent | ddd6507953d90452314553fedce6bbf7f372c635 (diff) | |
| parent | a50596874a4971167f97a05181363e91292a2885 (diff) | |
Merge release-20210726.0-50-ga50596874 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/cgroupfs/base.go')
| -rw-r--r-- | pkg/sentry/fsimpl/cgroupfs/base.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/sentry/fsimpl/cgroupfs/base.go b/pkg/sentry/fsimpl/cgroupfs/base.go index 4290ffe0d..71bb0a9c8 100644 --- a/pkg/sentry/fsimpl/cgroupfs/base.go +++ b/pkg/sentry/fsimpl/cgroupfs/base.go @@ -88,7 +88,6 @@ type controller interface { // +stateify savable type cgroupInode struct { dir - fs *filesystem // ts is the list of tasks in this cgroup. The kernel is responsible for // removing tasks from this list before they're destroyed, so any tasks on @@ -102,9 +101,10 @@ var _ kernel.CgroupImpl = (*cgroupInode)(nil) func (fs *filesystem) newCgroupInode(ctx context.Context, creds *auth.Credentials) kernfs.Inode { c := &cgroupInode{ - fs: fs, - ts: make(map[*kernel.Task]struct{}), + dir: dir{fs: fs}, + ts: make(map[*kernel.Task]struct{}), } + c.dir.cgi = c contents := make(map[string]kernfs.Inode) contents["cgroup.procs"] = fs.newControllerFile(ctx, creds, &cgroupProcsData{c}) @@ -115,8 +115,7 @@ func (fs *filesystem) newCgroupInode(ctx context.Context, creds *auth.Credential } c.dir.InodeAttrs.Init(ctx, creds, linux.UNNAMED_MAJOR, fs.devMinor, fs.NextIno(), linux.ModeDirectory|linux.FileMode(0555)) - c.dir.OrderedChildren.Init(kernfs.OrderedChildrenOptions{}) - c.dir.InitRefs() + c.dir.OrderedChildren.Init(kernfs.OrderedChildrenOptions{Writable: true}) c.dir.IncLinks(c.dir.OrderedChildren.Populate(contents)) atomic.AddUint64(&fs.numCgroups, 1) |