summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-12-04 16:23:21 +0000
committergVisor bot <gvisor-bot@google.com>2020-12-04 16:23:21 +0000
commit027a271ae5163e520635ea46a4fadbd3b68bf088 (patch)
tree411ea0dce83e83127950e32984aba22276189e7b /pkg/sentry
parent0ba39926c86fb6789cd48b93b5cbfca8d64c56ee (diff)
parent6708c8c97e4ede29935c8d3e809c7bb76309112c (diff)
Merge release-20201130.0-37-g6708c8c97 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/fs/fs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fs/fs.go b/pkg/sentry/fs/fs.go
index d2dbff268..a020da53b 100644
--- a/pkg/sentry/fs/fs.go
+++ b/pkg/sentry/fs/fs.go
@@ -65,7 +65,7 @@ var (
// runs with the lock held for reading. AsyncBarrier will take the lock
// for writing, thus ensuring that all Async work completes before
// AsyncBarrier returns.
- workMu sync.RWMutex
+ workMu sync.CrossGoroutineRWMutex
// asyncError is used to store up to one asynchronous execution error.
asyncError = make(chan error, 1)