diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-01 00:12:34 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-01 00:12:34 +0000 |
| commit | 675dde7c19e083e278651f0d1b0e63217653c5c3 (patch) | |
| tree | 01f03d67e901b605c7e089ae70e12f8aabe919b4 /pkg/sentry/socket/unix | |
| parent | 798a01e474c2edd73ae9b5f27c3f3970bb3ec054 (diff) | |
| parent | 101c97d6f851abbd3024605102757da66a36551f (diff) | |
Merge release-20200818.0-95-g101c97d6f (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
| -rw-r--r-- | pkg/sentry/socket/unix/socket_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/socket/unix/transport/queue_refs.go | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkg/sentry/socket/unix/socket_refs.go b/pkg/sentry/socket/unix/socket_refs.go index 39aaedc7f..69fa54964 100644 --- a/pkg/sentry/socket/unix/socket_refs.go +++ b/pkg/sentry/socket/unix/socket_refs.go @@ -1,11 +1,12 @@ package unix import ( + "runtime" + "sync/atomic" + "fmt" "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/socket/unix/transport/queue_refs.go b/pkg/sentry/socket/unix/transport/queue_refs.go index 4c3dcd13f..a154c8334 100644 --- a/pkg/sentry/socket/unix/transport/queue_refs.go +++ b/pkg/sentry/socket/unix/transport/queue_refs.go @@ -1,11 +1,12 @@ package transport import ( + "runtime" + "sync/atomic" + "fmt" "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 |