diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-16 14:50:34 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-16 14:50:34 +0000 |
| commit | d81c4f985afd00605c1aacba74531214147b302c (patch) | |
| tree | 44b6446b2df9f96d7c298288dfbc1c65e5cc2160 /pkg/sentry/vfs | |
| parent | ce5807fdb4a544ef045be0f8641aa88341ca1f9a (diff) | |
| parent | 326a1dbb73addeaf8e51af55b8a9de95638b4017 (diff) | |
Merge release-20200907.0-59-g326a1dbb7 (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rw-r--r-- | pkg/sentry/vfs/file_description_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/vfs/filesystem_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/vfs/mount_namespace_refs.go | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pkg/sentry/vfs/file_description_refs.go b/pkg/sentry/vfs/file_description_refs.go index 6c7747259..3953d2396 100644 --- a/pkg/sentry/vfs/file_description_refs.go +++ b/pkg/sentry/vfs/file_description_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "runtime" + "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" - "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/vfs/filesystem_refs.go b/pkg/sentry/vfs/filesystem_refs.go index 96f681831..c6a390430 100644 --- a/pkg/sentry/vfs/filesystem_refs.go +++ b/pkg/sentry/vfs/filesystem_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "runtime" + "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" - "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/vfs/mount_namespace_refs.go b/pkg/sentry/vfs/mount_namespace_refs.go index 4c422c81f..ed126cc5e 100644 --- a/pkg/sentry/vfs/mount_namespace_refs.go +++ b/pkg/sentry/vfs/mount_namespace_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "runtime" + "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" - "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so |