diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-03 20:39:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-03 20:39:15 +0000 |
| commit | 5dc426b55a2b3f695303aa76a3294585a0b32168 (patch) | |
| tree | b86d9c4c87cdd163af284499076a589f0de25d86 /pkg/sentry/fsimpl/fuse | |
| parent | ea213f005adb71369f5a32cc38b096179f20ea8d (diff) | |
| parent | b2ae7ea1bb207eddadd7962080e7bd0b8634db96 (diff) | |
Merge release-20200622.1-313-gb2ae7ea1b (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/fuse')
| -rw-r--r-- | pkg/sentry/fsimpl/fuse/dev.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/fuse/fusefs.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/fuse/dev.go b/pkg/sentry/fsimpl/fuse/dev.go index 2225076bc..e522ff9a0 100644 --- a/pkg/sentry/fsimpl/fuse/dev.go +++ b/pkg/sentry/fsimpl/fuse/dev.go @@ -99,7 +99,7 @@ type DeviceFD struct { } // Release implements vfs.FileDescriptionImpl.Release. -func (fd *DeviceFD) Release() { +func (fd *DeviceFD) Release(context.Context) { fd.fs.conn.connected = false } diff --git a/pkg/sentry/fsimpl/fuse/fusefs.go b/pkg/sentry/fsimpl/fuse/fusefs.go index 200a93bbf..a1405f7c3 100644 --- a/pkg/sentry/fsimpl/fuse/fusefs.go +++ b/pkg/sentry/fsimpl/fuse/fusefs.go @@ -191,9 +191,9 @@ func NewFUSEFilesystem(ctx context.Context, devMinor uint32, opts *filesystemOpt } // Release implements vfs.FilesystemImpl.Release. -func (fs *filesystem) Release() { +func (fs *filesystem) Release(ctx context.Context) { fs.Filesystem.VFSFilesystem().VirtualFilesystem().PutAnonBlockDevMinor(fs.devMinor) - fs.Filesystem.Release() + fs.Filesystem.Release(ctx) } // inode implements kernfs.Inode. |