diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-21 23:38:46 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-21 23:38:46 +0000 |
| commit | f41d7a64f0cb89936e9d432a0b3fe1cbab8681ee (patch) | |
| tree | 41ec11a1e21c83f848889383ed19f14da79b0925 /pkg/sentry/fsimpl/host | |
| parent | 47705f49649a22f89cb93d15389f6c69b3813f12 (diff) | |
| parent | bd3383a7e25b426fc6aa5a28fc8ffa6fe7fa333e (diff) | |
Merge release-20200810.0-87-gbd3383a7e (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/connected_endpoint_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/inode_refs.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go index 3b7bf599e..1fcf8ab73 100644 --- a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go +++ b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go @@ -1,11 +1,10 @@ package host import ( - "runtime" - "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 55c0fb3a9..c920a3c4e 100644 --- a/pkg/sentry/fsimpl/host/inode_refs.go +++ b/pkg/sentry/fsimpl/host/inode_refs.go @@ -1,11 +1,10 @@ package host import ( - "runtime" - "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 |