diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-01-16 21:04:22 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-01-16 21:04:22 +0000 |
commit | 47e62a0e3dff672ea69e70ec9ee057c77f72803e (patch) | |
tree | 8d2b88c28274499eb932c2d9131385890af15601 /pkg/sentry/fs/file_overlay.go | |
parent | 04d906d01293b63764895be93e50af1d65adb8ed (diff) | |
parent | 07f258497932e53f4651b80a086117ffda843fe3 (diff) |
Merge release-20200115.0-9-g07f2584 (automated)
Diffstat (limited to 'pkg/sentry/fs/file_overlay.go')
-rw-r--r-- | pkg/sentry/fs/file_overlay.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fs/file_overlay.go b/pkg/sentry/fs/file_overlay.go index 8a633b1ba..8991207b4 100644 --- a/pkg/sentry/fs/file_overlay.go +++ b/pkg/sentry/fs/file_overlay.go @@ -475,7 +475,7 @@ func readdirEntries(ctx context.Context, o *overlayEntry) (*SortedDentryMap, err // Skip this name if it is a negative entry in the // upper or there exists a whiteout for it. if o.upper != nil { - if overlayHasWhiteout(o.upper, name) { + if overlayHasWhiteout(ctx, o.upper, name) { continue } } |