diff options
| author | Jamie Liu <jamieliu@google.com> | 2019-10-15 18:39:16 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-15 18:40:45 -0700 |
| commit | 0457a4c4cb67537b09f47e58764f22434dbeff02 (patch) | |
| tree | f2891b2aa3e1d7e6ded35a951b9a913d99b55d57 /pkg/sentry/fsimpl/ext/directory.go | |
| parent | f98c3ee32c592417aa84f5c302b9db49f12ba129 (diff) | |
Minor vfs.FileDescriptionImpl fixes.
- Pass context.Context to OnClose().
- Pass memmap.MMapOpts to ConfigureMMap() by pointer so that implementations
can actually mutate it as required.
PiperOrigin-RevId: 274934967
Diffstat (limited to 'pkg/sentry/fsimpl/ext/directory.go')
| -rw-r--r-- | pkg/sentry/fsimpl/ext/directory.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/ext/directory.go b/pkg/sentry/fsimpl/ext/directory.go index 0b471d121..91802dc1e 100644 --- a/pkg/sentry/fsimpl/ext/directory.go +++ b/pkg/sentry/fsimpl/ext/directory.go @@ -301,8 +301,8 @@ func (fd *directoryFD) Seek(ctx context.Context, offset int64, whence int32) (in return offset, nil } -// IterDirents implements vfs.FileDescriptionImpl.IterDirents. -func (fd *directoryFD) ConfigureMMap(ctx context.Context, opts memmap.MMapOpts) error { +// ConfigureMMap implements vfs.FileDescriptionImpl.ConfigureMMap. +func (fd *directoryFD) ConfigureMMap(ctx context.Context, opts *memmap.MMapOpts) error { // mmap(2) specifies that EACCESS should be returned for non-regular file fds. return syserror.EACCES } |