diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-16 06:42:01 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-16 06:42:01 +0000 |
| commit | 6ca48576e8a40e169dc10e17084bbceecf8a0055 (patch) | |
| tree | ae0e054905ae4f02b715dc5a2d12ce05dec870fc /pkg/sentry/socket/unix | |
| parent | cbc7d6a202b7e47457b3aa3daa55ebc5c1fbdb72 (diff) | |
| parent | d201feb8c5e425bfa8abc905f24d49b268520aec (diff) | |
Merge release-20200907.0-57-gd201feb8c (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 dababb85f..680ea06cd 100644 --- a/pkg/sentry/socket/unix/socket_refs.go +++ b/pkg/sentry/socket/unix/socket_refs.go @@ -2,11 +2,11 @@ package unix import ( "fmt" + refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" "gvisor.dev/gvisor/pkg/log" - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" ) // 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..17951eb2f 100644 --- a/pkg/sentry/socket/unix/transport/queue_refs.go +++ b/pkg/sentry/socket/unix/transport/queue_refs.go @@ -2,11 +2,11 @@ package transport import ( "fmt" + refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" "gvisor.dev/gvisor/pkg/log" - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" ) // ownerType is used to customize logging. Note that we use a pointer to T so |