diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-22 21:48:19 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-22 21:48:19 +0000 |
| commit | 6e21bc474bf54085781d27285c9fe8430c121995 (patch) | |
| tree | a23743afc43b9a6370cb43971a96a3f81347b94e /pkg/sentry/fsimpl/proc/task_files.go | |
| parent | a2f8b4dcc444e98f9c593bcb77ba5a01dc47d9e3 (diff) | |
| parent | 20dc83c9ecde1c4e99e10023c79008420fa0601f (diff) | |
Merge release-20200914.0-133-g20dc83c9e (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/proc/task_files.go')
| -rw-r--r-- | pkg/sentry/fsimpl/proc/task_files.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/proc/task_files.go b/pkg/sentry/fsimpl/proc/task_files.go index 8f7e9b801..feed5bc3f 100644 --- a/pkg/sentry/fsimpl/proc/task_files.go +++ b/pkg/sentry/fsimpl/proc/task_files.go @@ -853,11 +853,11 @@ func (i *namespaceInode) Init(creds *auth.Credentials, devMajor, devMinor uint32 } // Open implements kernfs.Inode.Open. -func (i *namespaceInode) Open(ctx context.Context, rp *vfs.ResolvingPath, vfsd *vfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { +func (i *namespaceInode) Open(ctx context.Context, rp *vfs.ResolvingPath, d *kernfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { fd := &namespaceFD{inode: i} i.IncRef() fd.LockFD.Init(&i.locks) - if err := fd.vfsfd.Init(fd, opts.Flags, rp.Mount(), vfsd, &vfs.FileDescriptionOptions{}); err != nil { + if err := fd.vfsfd.Init(fd, opts.Flags, rp.Mount(), d.VFSDentry(), &vfs.FileDescriptionOptions{}); err != nil { return nil, err } return &fd.vfsfd, nil |