diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:32:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:32:32 +0000 |
| commit | b758e31a9b2f0f68d0c0182a74da954f81053f72 (patch) | |
| tree | 8cdfe4456e0b19ed5633af800f414ed12cc8c68e /pkg/sentry/vfs | |
| parent | a7a5a8528ca6f79dfd89941bd75c14930c43d42c (diff) | |
| parent | 325f7036b051a705d5ae595d2f3c351084262532 (diff) | |
Merge release-20200907.0-35-g325f7036b (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rw-r--r-- | pkg/sentry/vfs/file_description_refs.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/vfs/filesystem_refs.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/vfs/mount_namespace_refs.go | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkg/sentry/vfs/file_description_refs.go b/pkg/sentry/vfs/file_description_refs.go index 6c7747259..ebc089b4c 100644 --- a/pkg/sentry/vfs/file_description_refs.go +++ b/pkg/sentry/vfs/file_description_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "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..32f21c044 100644 --- a/pkg/sentry/vfs/filesystem_refs.go +++ b/pkg/sentry/vfs/filesystem_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "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..2c920ac41 100644 --- a/pkg/sentry/vfs/mount_namespace_refs.go +++ b/pkg/sentry/vfs/mount_namespace_refs.go @@ -1,11 +1,12 @@ package vfs import ( + "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 |