diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-03-10 04:59:13 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-10 04:59:13 +0000 |
| commit | 07d7f4d0572d1772fa5473f836f35e9a191d42da (patch) | |
| tree | e94f17de40a4ee99643b39bbc97380e2584e5c7f | |
| parent | 3ff22594df40a75093c4532aba800ac593cf274a (diff) | |
| parent | 14fc2ddd6cb2f25482ef0d16ec5e3ffda3dd0f6e (diff) | |
Merge release-20210301.0-33-g14fc2ddd6 (automated)
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | runsc/container/state_file.go | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -20,7 +20,7 @@ require ( github.com/docker/docker v1.4.2-0.20191028175130-9e7d5ac5ea55 // indirect github.com/docker/go-connections v0.3.0 // indirect github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect - github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 // indirect + github.com/gofrs/flock v0.8.0 // indirect github.com/gogo/googleapis v1.4.0 // indirect github.com/gogo/protobuf v1.3.1 // indirect github.com/golang/mock v1.4.4 // indirect @@ -135,6 +135,8 @@ github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 h1:JFTFz3HZTGmgMz4E1TabNBNJljROSYgja1b4l50FNVs= github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= +github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= diff --git a/runsc/container/state_file.go b/runsc/container/state_file.go index 4ed73eb84..0399903a0 100644 --- a/runsc/container/state_file.go +++ b/runsc/container/state_file.go @@ -245,7 +245,7 @@ type StateFile struct { // lock globally locks all locking operations for the container. func (s *StateFile) lock() error { s.once.Do(func() { - s.flock = flock.NewFlock(s.lockPath()) + s.flock = flock.New(s.lockPath()) }) if err := s.flock.Lock(); err != nil { |