diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-10 10:16:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-10 10:16:17 +0000 |
| commit | 270fba351c1586dbc1ecea253cba350fb24c44d8 (patch) | |
| tree | c8ff73ddaaf2cc6c26a0f3e860c1b375582d9399 /pkg/sentry/socket/unix | |
| parent | 2c0bbc602f87a87f718e1363159da859422dd99d (diff) | |
| parent | 9a003835f9750630c8acef2f7453eb7c134863b1 (diff) | |
Merge release-20200818.0-149-g9a003835f (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
| -rw-r--r-- | pkg/sentry/socket/unix/socket_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/socket/unix/transport/queue_refs.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/socket/unix/socket_refs.go b/pkg/sentry/socket/unix/socket_refs.go index dababb85f..a0e5d1393 100644 --- a/pkg/sentry/socket/unix/socket_refs.go +++ b/pkg/sentry/socket/unix/socket_refs.go @@ -1,12 +1,12 @@ package unix import ( - "fmt" - "runtime" "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/socket/unix/transport/queue_refs.go b/pkg/sentry/socket/unix/transport/queue_refs.go index 0d4e34988..21d43fc24 100644 --- a/pkg/sentry/socket/unix/transport/queue_refs.go +++ b/pkg/sentry/socket/unix/transport/queue_refs.go @@ -1,12 +1,12 @@ package transport import ( - "fmt" - "runtime" "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" ) // ownerType is used to customize logging. Note that we use a pointer to T so |