diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-22 17:03:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-22 17:03:20 +0000 |
| commit | d07a4cfdf34371df1a94791d013e62a707cbb683 (patch) | |
| tree | d1a3f9326a7125c8b367bbfef1b7b2220d4ce723 /pkg/sentry/socket/unix | |
| parent | a425892df3749c96c8557546f185358c2f784a66 (diff) | |
| parent | 13a9a622e13ccdda76ed02d3de99b565212f6b2f (diff) | |
Merge release-20200914.0-130-g13a9a622e (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 |