diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-10 01:42:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-10 01:42:15 +0000 |
| commit | a40ebdcb7944050fc94c70f491336deb21768f59 (patch) | |
| tree | 58adc45d03ba194279a0d3d1180cb8c1e25af6b4 /pkg/sentry/socket/unix | |
| parent | 4fec9ed0c6c6dde8a13707a0e98b06208f4373dc (diff) | |
| parent | 2c7df1a9a5cd5288404308e8f0775499d68a0b13 (diff) | |
Merge release-20200818.0-146-g2c7df1a9a (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
| -rw-r--r-- | pkg/sentry/socket/unix/socket_refs.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/socket/unix/transport/queue_refs.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/socket/unix/socket_refs.go b/pkg/sentry/socket/unix/socket_refs.go index 69fa54964..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 ( - "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 a154c8334..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 ( - "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 |