diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-25 07:29:09 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-25 07:29:09 +0000 |
| commit | 063b02982e1cff93013b3829fb03fe2cd99cc68a (patch) | |
| tree | d8aaa75a85114d77a9c0fbeb86b37f432a7fc124 /pkg/sentry/fsimpl/host | |
| parent | 4a510883b8786fecfb44741681408c1c75ed1dd8 (diff) | |
| parent | c61f6fcf6ab3178da3a297d3e3199379b188ce61 (diff) | |
Merge release-20200818.0-38-gc61f6fcf6 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/connected_endpoint_refs.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/inode_refs.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go index 1fcf8ab73..1f13a2608 100644 --- a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go +++ b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go @@ -1,10 +1,11 @@ package host import ( + "sync/atomic" + "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/fsimpl/host/inode_refs.go b/pkg/sentry/fsimpl/host/inode_refs.go index c920a3c4e..2c67758a0 100644 --- a/pkg/sentry/fsimpl/host/inode_refs.go +++ b/pkg/sentry/fsimpl/host/inode_refs.go @@ -1,10 +1,11 @@ package host import ( + "sync/atomic" + "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 |