diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-24 17:19:53 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-24 17:19:53 +0000 |
| commit | 61cc049caaa2317eda73e66f65f82b5099dd2bc2 (patch) | |
| tree | 352bfc9c114c181e052a9656be9f3b2acd5f7b33 /pkg/sentry/vfs/lock.go | |
| parent | 3102024707dc370e025f1b46fa2be12eade2f9cb (diff) | |
| parent | 0a7075f38a4870ded687e117a299ac4996c0673e (diff) | |
Merge release-20200914.0-152-g0a7075f38 (automated)
Diffstat (limited to 'pkg/sentry/vfs/lock.go')
| -rw-r--r-- | pkg/sentry/vfs/lock.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/vfs/lock.go b/pkg/sentry/vfs/lock.go index 42666eebf..55783d4eb 100644 --- a/pkg/sentry/vfs/lock.go +++ b/pkg/sentry/vfs/lock.go @@ -33,6 +33,8 @@ import ( // Note that in Linux these two types of locks are _not_ cooperative, because // race and deadlock conditions make merging them prohibitive. We do the same // and keep them oblivious to each other. +// +// +stateify savable type FileLocks struct { // bsd is a set of BSD-style advisory file wide locks, see flock(2). bsd fslock.Locks |