diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-16 23:19:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-16 23:19:30 +0000 |
| commit | 894e4241a1cbbe065c8802c4ddba988c43f5c2b7 (patch) | |
| tree | a8a5eb8339cf390a1ba1783ae5ec36bca52871b9 /pkg/sentry/fs/proc/task.go | |
| parent | e5f7f1a0ce57265b7cd3204c7566b4d4848fe6c3 (diff) | |
| parent | ab48112e41427579ecf585f6280be1e2d58acf06 (diff) | |
Merge release-20200115.0-14-gab48112 (automated)
Diffstat (limited to 'pkg/sentry/fs/proc/task.go')
| -rw-r--r-- | pkg/sentry/fs/proc/task.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/fs/proc/task.go b/pkg/sentry/fs/proc/task.go index 9bf4b4527..7358d6ef9 100644 --- a/pkg/sentry/fs/proc/task.go +++ b/pkg/sentry/fs/proc/task.go @@ -37,6 +37,8 @@ import ( "gvisor.dev/gvisor/pkg/waiter" ) +// LINT.IfChange + // getTaskMM returns t's MemoryManager. If getTaskMM succeeds, the MemoryManager's // users count is incremented, and must be decremented by the caller when it is // no longer in use. @@ -800,3 +802,5 @@ func (f *auxvecFile) Read(ctx context.Context, _ *fs.File, dst usermem.IOSequenc n, err := dst.CopyOut(ctx, buf[offset:]) return int64(n), err } + +// LINT.ThenChange(../../fsimpl/proc/task.go|../../fsimpl/proc/task_files.go) |