diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-08 18:54:34 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-08 18:54:34 +0000 |
| commit | 4b54cf560806d545a938f0722e8457b643156744 (patch) | |
| tree | a1a67dcdaf14c77b0217cff866e377e07a5a6075 /pkg/sentry/socket/unix | |
| parent | b99e5cd792454445aa8e9cbd6fc302fc4c0958b3 (diff) | |
| parent | d84ec6c42bd700c1a993817cd3b4a2f3c4f0325d (diff) | |
Merge release-20200818.0-126-gd84ec6c42 (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 |