diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-24 20:51:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-24 20:51:51 +0000 |
| commit | 017f008592692843a5f079f330b77f47077cc1a5 (patch) | |
| tree | 52d5d04e89cdbf909ac4d723fd7cea094503ee60 /pkg/sentry/fs | |
| parent | f66db7bcc6eb1e2c6272c9859291b0c089ca7e03 (diff) | |
| parent | f13f26d17da56d585fd9857a81175bbd0be8ce60 (diff) | |
Merge release-20200323.0-239-gf13f26d (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/host/control.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/fs/host/control.go b/pkg/sentry/fs/host/control.go index 52c0504b6..39299b7e4 100644 --- a/pkg/sentry/fs/host/control.go +++ b/pkg/sentry/fs/host/control.go @@ -23,6 +23,8 @@ import ( "gvisor.dev/gvisor/pkg/sentry/socket/unix/transport" ) +// LINT.IfChange + type scmRights struct { fds []int } @@ -32,8 +34,6 @@ func newSCMRights(fds []int) control.SCMRights { } // Files implements control.SCMRights.Files. -// -// TODO(gvisor.dev/issue/2017): Port to VFS2. func (c *scmRights) Files(ctx context.Context, max int) (control.RightsFiles, bool) { n := max var trunc bool @@ -93,3 +93,5 @@ func fdsToFiles(ctx context.Context, fds []int) []*fs.File { } return files } + +// LINT.ThenChange(../../fsimpl/host/control.go) |