diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-16 21:21:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-16 21:21:14 +0000 |
| commit | 81b4980e9ef358a169ea3720ccf65e3e8e2a0f87 (patch) | |
| tree | fbbd99084c6f3a79eedc6c5d8448151dcae58dc0 /pkg/sentry/socket | |
| parent | 2cb2cbfc4a6eb66524410a318f603ed5051b04f8 (diff) | |
| parent | 666397c5c82ee18a776491919312d19cfe6d4a07 (diff) | |
Merge release-20200907.0-64-g666397c5c (automated)
Diffstat (limited to 'pkg/sentry/socket')
| -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, 4 insertions, 6 deletions
diff --git a/pkg/sentry/socket/unix/socket_refs.go b/pkg/sentry/socket/unix/socket_refs.go index dababb85f..39aaedc7f 100644 --- a/pkg/sentry/socket/unix/socket_refs.go +++ b/pkg/sentry/socket/unix/socket_refs.go @@ -2,11 +2,10 @@ package unix import ( "fmt" - "runtime" - "sync/atomic" - "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 0d4e34988..4c3dcd13f 100644 --- a/pkg/sentry/socket/unix/transport/queue_refs.go +++ b/pkg/sentry/socket/unix/transport/queue_refs.go @@ -2,11 +2,10 @@ package transport import ( "fmt" - "runtime" - "sync/atomic" - "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 |