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/fuse/fusefs.go | |
| parent | a2f8b4dcc444e98f9c593bcb77ba5a01dc47d9e3 (diff) | |
| parent | 20dc83c9ecde1c4e99e10023c79008420fa0601f (diff) | |
Merge release-20200914.0-133-g20dc83c9e (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/fuse/fusefs.go')
| -rw-r--r-- | pkg/sentry/fsimpl/fuse/fusefs.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/fuse/fusefs.go b/pkg/sentry/fsimpl/fuse/fusefs.go index 2144e72bd..4178436dd 100644 --- a/pkg/sentry/fsimpl/fuse/fusefs.go +++ b/pkg/sentry/fsimpl/fuse/fusefs.go @@ -299,7 +299,7 @@ func (fs *filesystem) newInode(nodeID uint64, attr linux.FUSEAttr) *kernfs.Dentr } // Open implements kernfs.Inode.Open. -func (i *inode) Open(ctx context.Context, rp *vfs.ResolvingPath, vfsd *vfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { +func (i *inode) Open(ctx context.Context, rp *vfs.ResolvingPath, d *kernfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { isDir := i.InodeAttrs.Mode().IsDir() // return error if specified to open directory but inode is not a directory. if !isDir && opts.Mode.IsDir() { @@ -395,7 +395,7 @@ func (i *inode) Open(ctx context.Context, rp *vfs.ResolvingPath, vfsd *vfs.Dentr i.attributeTime = 0 } - if err := fd.vfsfd.Init(fdImpl, opts.Flags, rp.Mount(), vfsd, fdOptions); err != nil { + if err := fd.vfsfd.Init(fdImpl, opts.Flags, rp.Mount(), d.VFSDentry(), fdOptions); err != nil { return nil, err } return &fd.vfsfd, nil |