diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-21 17:47:50 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-21 17:47:50 +0000 |
| commit | 1b4035afb3411e3daa51e6ef123630e1d24d6341 (patch) | |
| tree | 762633005c8ce0861e564914c53bf6bcab32f94a /pkg/sentry/vfs/file_description.go | |
| parent | 03fd0836497d44a69439b8114eb2663ebf782040 (diff) | |
| parent | c2955339d86437981ce53d2971ce83479ef94028 (diff) | |
Merge release-20210419.0-12-gc2955339d (automated)
Diffstat (limited to 'pkg/sentry/vfs/file_description.go')
| -rw-r--r-- | pkg/sentry/vfs/file_description.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/sentry/vfs/file_description.go b/pkg/sentry/vfs/file_description.go index 176bcc242..f612a71b2 100644 --- a/pkg/sentry/vfs/file_description.go +++ b/pkg/sentry/vfs/file_description.go @@ -524,7 +524,7 @@ func (fd *FileDescription) Stat(ctx context.Context, opts StatOptions) (linux.St Start: fd.vd, }) stat, err := fd.vd.mount.fs.impl.StatAt(ctx, rp, opts) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return stat, err } return fd.impl.Stat(ctx, opts) @@ -539,7 +539,7 @@ func (fd *FileDescription) SetStat(ctx context.Context, opts SetStatOptions) err Start: fd.vd, }) err := fd.vd.mount.fs.impl.SetStatAt(ctx, rp, opts) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return err } return fd.impl.SetStat(ctx, opts) @@ -555,7 +555,7 @@ func (fd *FileDescription) StatFS(ctx context.Context) (linux.Statfs, error) { Start: fd.vd, }) statfs, err := fd.vd.mount.fs.impl.StatFSAt(ctx, rp) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return statfs, err } return fd.impl.StatFS(ctx) @@ -701,7 +701,7 @@ func (fd *FileDescription) ListXattr(ctx context.Context, size uint64) ([]string Start: fd.vd, }) names, err := fd.vd.mount.fs.impl.ListXattrAt(ctx, rp, size) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return names, err } names, err := fd.impl.ListXattr(ctx, size) @@ -730,7 +730,7 @@ func (fd *FileDescription) GetXattr(ctx context.Context, opts *GetXattrOptions) Start: fd.vd, }) val, err := fd.vd.mount.fs.impl.GetXattrAt(ctx, rp, *opts) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return val, err } return fd.impl.GetXattr(ctx, *opts) @@ -746,7 +746,7 @@ func (fd *FileDescription) SetXattr(ctx context.Context, opts *SetXattrOptions) Start: fd.vd, }) err := fd.vd.mount.fs.impl.SetXattrAt(ctx, rp, *opts) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return err } return fd.impl.SetXattr(ctx, *opts) @@ -762,7 +762,7 @@ func (fd *FileDescription) RemoveXattr(ctx context.Context, name string) error { Start: fd.vd, }) err := fd.vd.mount.fs.impl.RemoveXattrAt(ctx, rp, name) - rp.Release(ctx) + vfsObj.putResolvingPath(ctx, rp) return err } return fd.impl.RemoveXattr(ctx, name) |