summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/mm
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/mm
parent085d6fdce34f34d82de5f71d031407c3da253b23 (diff)
parent5b41ba5d0eca266790dba5f5dd095010e3944726 (diff)
Merge 5b41ba5d (automated)
Diffstat (limited to 'pkg/sentry/mm')
-rwxr-xr-xpkg/sentry/mm/file_refcount_set.go2
-rw-r--r--pkg/sentry/mm/mm.go2
-rwxr-xr-xpkg/sentry/mm/pma_set.go2
-rw-r--r--pkg/sentry/mm/vma.go2
-rwxr-xr-xpkg/sentry/mm/vma_set.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/pkg/sentry/mm/file_refcount_set.go b/pkg/sentry/mm/file_refcount_set.go
index 84a7fd759..6b3081009 100755
--- a/pkg/sentry/mm/file_refcount_set.go
+++ b/pkg/sentry/mm/file_refcount_set.go
@@ -1189,7 +1189,7 @@ func (s *fileRefcountSet) 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 *fileRefcountnode) String() string {
var buf bytes.Buffer
n.writeDebugString(&buf, "")
diff --git a/pkg/sentry/mm/mm.go b/pkg/sentry/mm/mm.go
index 7bb96b159..f350e0109 100644
--- a/pkg/sentry/mm/mm.go
+++ b/pkg/sentry/mm/mm.go
@@ -74,7 +74,7 @@ type MemoryManager struct {
// privateRefs is immutable.
privateRefs *privateRefs
- // users is the number of dependences on the mappings in the MemoryManager.
+ // users is the number of dependencies on the mappings in the MemoryManager.
// When the number of references in users reaches zero, all mappings are
// unmapped.
//
diff --git a/pkg/sentry/mm/pma_set.go b/pkg/sentry/mm/pma_set.go
index a048a299c..52e66468c 100755
--- a/pkg/sentry/mm/pma_set.go
+++ b/pkg/sentry/mm/pma_set.go
@@ -1189,7 +1189,7 @@ func (s *pmaSet) 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 *pmanode) String() string {
var buf bytes.Buffer
n.writeDebugString(&buf, "")
diff --git a/pkg/sentry/mm/vma.go b/pkg/sentry/mm/vma.go
index 074e2b141..f2fd70799 100644
--- a/pkg/sentry/mm/vma.go
+++ b/pkg/sentry/mm/vma.go
@@ -34,7 +34,7 @@ func (mm *MemoryManager) createVMALocked(ctx context.Context, opts memmap.MMapOp
panic(fmt.Sprintf("Non-effective MaxPerms %s cannot be enforced", opts.MaxPerms))
}
- // Find a useable range.
+ // Find a usable range.
addr, err := mm.findAvailableLocked(opts.Length, findAvailableOpts{
Addr: opts.Addr,
Fixed: opts.Fixed,
diff --git a/pkg/sentry/mm/vma_set.go b/pkg/sentry/mm/vma_set.go
index 0211e2fce..c3ef24f34 100755
--- a/pkg/sentry/mm/vma_set.go
+++ b/pkg/sentry/mm/vma_set.go
@@ -1189,7 +1189,7 @@ func (s *vmaSet) 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 *vmanode) String() string {
var buf bytes.Buffer
n.writeDebugString(&buf, "")