summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/lock
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-06-27 21:44:07 +0000
committergVisor bot <gvisor-bot@google.com>2019-06-27 21:44:07 +0000
commit91dcb2483b56eeb8083cdff90ed8e8f0a1665d13 (patch)
treea2752b44b8da8abf49f60cef2a324068503111cb /pkg/sentry/fs/lock
parent085d6fdce34f34d82de5f71d031407c3da253b23 (diff)
parent5b41ba5d0eca266790dba5f5dd095010e3944726 (diff)
Merge 5b41ba5d (automated)
Diffstat (limited to 'pkg/sentry/fs/lock')
-rw-r--r--pkg/sentry/fs/lock/lock.go2
-rwxr-xr-xpkg/sentry/fs/lock/lock_set.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fs/lock/lock.go b/pkg/sentry/fs/lock/lock.go
index a074ecab0..636484424 100644
--- a/pkg/sentry/fs/lock/lock.go
+++ b/pkg/sentry/fs/lock/lock.go
@@ -134,7 +134,7 @@ const (
// LockRegion attempts to acquire a typed lock for the uid on a region
// of a file. Returns true if successful in locking the region. If false
// is returned, the caller should normally interpret this as "try again later" if
-// accquiring the lock in a non-blocking mode or "interrupted" if in a blocking mode.
+// acquiring the lock in a non-blocking mode or "interrupted" if in a blocking mode.
// Blocker is the interface used to provide blocking behavior, passing a nil Blocker
// will result in non-blocking behavior.
func (l *Locks) LockRegion(uid UniqueID, t LockType, r LockRange, block Blocker) bool {
diff --git a/pkg/sentry/fs/lock/lock_set.go b/pkg/sentry/fs/lock/lock_set.go
index 127ca5012..2343ca0b4 100755
--- a/pkg/sentry/fs/lock/lock_set.go
+++ b/pkg/sentry/fs/lock/lock_set.go
@@ -1185,7 +1185,7 @@ func (s *LockSet) String() string {
return s.root.String()
}
-// String stringifes a node (and all of its children) for debugging.
+// String stringifies a node (and all of its children) for debugging.
func (n *Locknode) String() string {
var buf bytes.Buffer
n.writeDebugString(&buf, "")