diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-21 21:33:02 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-21 21:33:02 +0000 |
| commit | 1b1de470fa39ce55df3559c2e4901a74d3084f13 (patch) | |
| tree | bfffb7fbe247127b9a28c0f83f5689a601ef80ad /pkg/sentry/fsimpl/host | |
| parent | bb26261d7bf19ace95bad78a7e5b88df75618997 (diff) | |
| parent | 5ec3d4ed3e3cda8944e851ef845f6d275999858a (diff) | |
Merge release-20200810.0-83-g5ec3d4ed3 (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..3ef6500fa 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 ( - "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" + + "gvisor.dev/gvisor/pkg/log" ) // 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..fc13b3cc7 100644 --- a/pkg/sentry/fsimpl/host/inode_refs.go +++ b/pkg/sentry/fsimpl/host/inode_refs.go @@ -1,10 +1,11 @@ package host import ( - "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" + + "gvisor.dev/gvisor/pkg/log" ) // ownerType is used to customize logging. Note that we use a pointer to T so |