diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-15 01:46:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-15 01:46:20 +0000 |
| commit | 8d5428e2668e1af6d6801af4337b4274c69f72db (patch) | |
| tree | c5a6981b075f73476c71f1c72d1ead84ee12a77f /pkg/sentry/fsimpl/proc/tasks_files.go | |
| parent | d75b58d63ab2dd2509a387530b899545c0d36917 (diff) | |
| parent | 33b41d8fe98e7820118e8d42b0cfbec4ca159d62 (diff) | |
Merge release-20211005.0-47-g33b41d8fe (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/proc/tasks_files.go')
| -rw-r--r-- | pkg/sentry/fsimpl/proc/tasks_files.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/proc/tasks_files.go b/pkg/sentry/fsimpl/proc/tasks_files.go index 4d3a2f7e6..faec36d8d 100644 --- a/pkg/sentry/fsimpl/proc/tasks_files.go +++ b/pkg/sentry/fsimpl/proc/tasks_files.go @@ -262,9 +262,8 @@ var _ dynamicInode = (*meminfoData)(nil) // Generate implements vfs.DynamicBytesSource.Generate. func (*meminfoData) Generate(ctx context.Context, buf *bytes.Buffer) error { - k := kernel.KernelFromContext(ctx) - mf := k.MemoryFile() - mf.UpdateUsage() + mf := kernel.KernelFromContext(ctx).MemoryFile() + _ = mf.UpdateUsage() // Best effort snapshot, totalUsage := usage.MemoryAccounting.Copy() totalSize := usage.TotalMemory(mf.TotalSize(), totalUsage) anon := snapshot.Anonymous + snapshot.Tmpfs |