diff options
| author | Ayush Ranjan <ayushranjan@google.com> | 2019-08-16 10:18:58 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-08-16 10:20:11 -0700 |
| commit | 4bab7d7f084c4ce4a8bf5860b71df6aee757cd5c (patch) | |
| tree | 1af2f9e4fa26b6f6987354967d534d34f063d304 /pkg/sentry/fsimpl/memfs | |
| parent | ef045b914bc8d9795f9184aed4b13351be70a3cf (diff) | |
vfs: Remove vfs.DefaultDirectoryFD from embedding vfs.DefaultFD.
This fixes the implementation ambiguity issues when a filesystem
implementation embeds vfs.DefaultDirectoryFD to its directory FD along
with an internal common fileDescription utility.
For similar reasons also removes FileDescriptionDefaultImpl from
DynamicBytesFileDescriptionImpl.
PiperOrigin-RevId: 263795513
Diffstat (limited to 'pkg/sentry/fsimpl/memfs')
| -rw-r--r-- | pkg/sentry/fsimpl/memfs/memfs.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/memfs/regular_file.go | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/memfs/memfs.go b/pkg/sentry/fsimpl/memfs/memfs.go index 59612da14..45cd42b3e 100644 --- a/pkg/sentry/fsimpl/memfs/memfs.go +++ b/pkg/sentry/fsimpl/memfs/memfs.go @@ -258,6 +258,7 @@ func (i *inode) direntType() uint8 { // vfs.FileDescriptionImpl. type fileDescription struct { vfsfd vfs.FileDescription + vfs.FileDescriptionDefaultImpl flags uint32 // status flags; immutable } diff --git a/pkg/sentry/fsimpl/memfs/regular_file.go b/pkg/sentry/fsimpl/memfs/regular_file.go index 7a16d5719..55f869798 100644 --- a/pkg/sentry/fsimpl/memfs/regular_file.go +++ b/pkg/sentry/fsimpl/memfs/regular_file.go @@ -46,7 +46,6 @@ func (fs *filesystem) newRegularFile(creds *auth.Credentials, mode uint16) *inod type regularFileFD struct { fileDescription - vfs.FileDescriptionDefaultImpl // These are immutable. readable bool |