summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-11-19 07:13:48 +0000
committergVisor bot <gvisor-bot@google.com>2020-11-19 07:13:48 +0000
commit817a3a5fa7877c5c0688cd7592d39acfeef5934c (patch)
tree9147b62995155646a8d613a9ae54a0eecb9c16a8 /pkg/sentry
parent317cc02865c2b8f184688a852dce0ed0bdb19c20 (diff)
parent74bc6e56ccd999998805e142622314f86dce770c (diff)
Merge release-20201109.0-85-g74bc6e56c (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/fsimpl/kernfs/kernfs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/kernfs/kernfs.go b/pkg/sentry/fsimpl/kernfs/kernfs.go
index c14abcff4..565d723f0 100644
--- a/pkg/sentry/fsimpl/kernfs/kernfs.go
+++ b/pkg/sentry/fsimpl/kernfs/kernfs.go
@@ -286,7 +286,7 @@ func (d *Dentry) cacheLocked(ctx context.Context) {
refs := atomic.LoadInt64(&d.refs)
if refs == -1 {
// Dentry has already been destroyed.
- panic(fmt.Sprintf("cacheLocked called on a dentry which has already been destroyed: %v", d))
+ return
}
if refs > 0 {
if d.cached {