diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-20 00:52:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-20 00:52:28 +0000 |
| commit | 85fb1397851dc95961e4fedea8f9cd9f4af9e648 (patch) | |
| tree | 81e652b96c84f2558c08c1a8495843ba86f85c4a /pkg/sentry/fsimpl/overlay/overlay.go | |
| parent | 8875e38909ee1042c59b91c3e3d785490e3a84a6 (diff) | |
| parent | cd86bd493156f055aa09a5c23f33a8a432cb8d00 (diff) | |
Merge release-20201005.0-104-gcd86bd493 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/overlay/overlay.go')
| -rw-r--r-- | pkg/sentry/fsimpl/overlay/overlay.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/overlay/overlay.go b/pkg/sentry/fsimpl/overlay/overlay.go index e5f506d2e..4c5de8d32 100644 --- a/pkg/sentry/fsimpl/overlay/overlay.go +++ b/pkg/sentry/fsimpl/overlay/overlay.go @@ -18,7 +18,7 @@ // // Lock order: // -// directoryFD.mu / nonDirectoryFD.mu +// directoryFD.mu / regularFileFD.mu // filesystem.renameMu // dentry.dirMu // dentry.copyMu @@ -453,7 +453,7 @@ type dentry struct { // - If this dentry is copied-up, then wrappedMappable is the Mappable // obtained from a call to the current top layer's // FileDescription.ConfigureMMap(). Once wrappedMappable becomes non-nil - // (from a call to nonDirectoryFD.ensureMappable()), it cannot become nil. + // (from a call to regularFileFD.ensureMappable()), it cannot become nil. // wrappedMappable is protected by mapsMu and dataMu. // // - isMappable is non-zero iff wrappedMappable is non-nil. isMappable is |