diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-20 18:10:54 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-20 18:10:54 +0000 |
| commit | 931605e111a26230804569f960fd39dc279cd435 (patch) | |
| tree | be9a80c830f6d881b298252ec415d361f16fb74c /pkg/sentry | |
| parent | c8401ce2aa65d1d9f5a59877e090149f4d741f47 (diff) | |
| parent | 710adf23cd151558af718e1a8a02f2abe1059d82 (diff) | |
Merge release-20200810.0-71-g710adf23c (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/fsimpl/tmpfs/inode_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/socket/unix/socket_refs.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/fsimpl/tmpfs/inode_refs.go b/pkg/sentry/fsimpl/tmpfs/inode_refs.go index 175dc3409..3245ede1f 100644 --- a/pkg/sentry/fsimpl/tmpfs/inode_refs.go +++ b/pkg/sentry/fsimpl/tmpfs/inode_refs.go @@ -1,11 +1,11 @@ package tmpfs import ( - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" "sync/atomic" "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/socket_refs.go b/pkg/sentry/socket/unix/socket_refs.go index 090395057..6ed7b1151 100644 --- a/pkg/sentry/socket/unix/socket_refs.go +++ b/pkg/sentry/socket/unix/socket_refs.go @@ -1,11 +1,11 @@ package unix import ( - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" "sync/atomic" "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 |