summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl/pipefs/pipefs.go
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2020-04-24 12:36:14 -0700
committergVisor bot <gvisor-bot@google.com>2020-04-24 12:37:49 -0700
commit632b104aff3fedf7798447eedc5662c973525c66 (patch)
tree838704ef4e7457ed93b0be8e936f0999a43d92e6 /pkg/sentry/fsimpl/pipefs/pipefs.go
parent2cc0fd42f462f3942230c4b33ca2825e2a28765d (diff)
Plumb context.Context into kernfs.Inode.Open().
PiperOrigin-RevId: 308304793
Diffstat (limited to 'pkg/sentry/fsimpl/pipefs/pipefs.go')
-rw-r--r--pkg/sentry/fsimpl/pipefs/pipefs.go5
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 100644
--- 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