diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-24 19:40:44 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-24 19:40:44 +0000 |
| commit | 1177ad72d12ed8ed0eb5f4a1f473af9f1dcb7c24 (patch) | |
| tree | fb248387666198adf7c0e37e7cb82f613b9ab0e6 /pkg/sentry/fsimpl/pipefs | |
| parent | ada068d683c1f6be72ecbeda436659ba6ecd1e9a (diff) | |
| parent | 632b104aff3fedf7798447eedc5662c973525c66 (diff) | |
Merge release-20200323.0-236-g632b104 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/pipefs')
| -rwxr-xr-x | pkg/sentry/fsimpl/pipefs/pipefs.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/pipefs/pipefs.go b/pkg/sentry/fsimpl/pipefs/pipefs.go index faf3179bc..d6bd67467 100755 --- a/pkg/sentry/fsimpl/pipefs/pipefs.go +++ b/pkg/sentry/fsimpl/pipefs/pipefs.go @@ -129,9 +129,8 @@ func (i *inode) SetStat(ctx context.Context, vfsfs *vfs.Filesystem, creds *auth. } // Open implements kernfs.Inode.Open. -func (i *inode) Open(rp *vfs.ResolvingPath, vfsd *vfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { - // FIXME(b/38173783): kernfs does not plumb Context here. - return i.pipe.Open(context.Background(), rp.Mount(), vfsd, opts.Flags) +func (i *inode) Open(ctx context.Context, rp *vfs.ResolvingPath, vfsd *vfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { + return i.pipe.Open(ctx, rp.Mount(), vfsd, opts.Flags) } // NewConnectedPipeFDs returns a pair of FileDescriptions representing the read |