diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-01-12 20:47:44 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-01-12 20:47:44 +0000 |
commit | fbc3a3d984eb113f7487e38ba55e5f813fc72aec (patch) | |
tree | d22a96c80f5f9a35c71687740e35c0021475d428 /pkg/sentry/fs/lock | |
parent | 1ea6658d24215e9fbcdb693b00884e1bdbdcc95d (diff) | |
parent | 4e03e87547853523d4ff941935a6ef1712518c61 (diff) |
Merge release-20201216.0-87-g4e03e8754 (automated)
Diffstat (limited to 'pkg/sentry/fs/lock')
-rw-r--r-- | pkg/sentry/fs/lock/lock_set.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fs/lock/lock_set.go b/pkg/sentry/fs/lock/lock_set.go index 37c216b95..4bc830883 100644 --- a/pkg/sentry/fs/lock/lock_set.go +++ b/pkg/sentry/fs/lock/lock_set.go @@ -1556,8 +1556,8 @@ type LockSegmentDataSlices struct { Values []Lock } -// ExportSortedSlice returns a copy of all segments in the given set, in ascending -// key order. +// ExportSortedSlices returns a copy of all segments in the given set, in +// ascending key order. func (s *LockSet) ExportSortedSlices() *LockSegmentDataSlices { var sds LockSegmentDataSlices for seg := s.FirstSegment(); seg.Ok(); seg = seg.NextSegment() { @@ -1571,7 +1571,7 @@ func (s *LockSet) ExportSortedSlices() *LockSegmentDataSlices { return &sds } -// ImportSortedSlice initializes the given set from the given slice. +// ImportSortedSlices initializes the given set from the given slice. // // Preconditions: // * s must be empty. |