diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-04 04:48:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-04 04:48:20 +0000 |
| commit | 27719ce07c53993b758ce7cc3ca298c1f9335b3a (patch) | |
| tree | b3a9d7ef732c36532dbd78070a35fe7c1045b810 /pkg/sentry/fsimpl/kernfs | |
| parent | 1ee4e990d8b118e06384b569f0607e1b42efec56 (diff) | |
| parent | b6d6a120d07ec0d1b3c0a3abc9e78b6e0bbd3966 (diff) | |
Merge release-20200818.0-122-gb6d6a120d (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/kernfs')
| -rw-r--r-- | pkg/sentry/fsimpl/kernfs/dentry_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/kernfs/static_directory_refs.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/fsimpl/kernfs/dentry_refs.go b/pkg/sentry/fsimpl/kernfs/dentry_refs.go index 79863b3bc..0269851c9 100644 --- a/pkg/sentry/fsimpl/kernfs/dentry_refs.go +++ b/pkg/sentry/fsimpl/kernfs/dentry_refs.go @@ -1,12 +1,12 @@ package kernfs 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/fsimpl/kernfs/static_directory_refs.go b/pkg/sentry/fsimpl/kernfs/static_directory_refs.go index 478b04bdd..866620ef9 100644 --- a/pkg/sentry/fsimpl/kernfs/static_directory_refs.go +++ b/pkg/sentry/fsimpl/kernfs/static_directory_refs.go @@ -1,12 +1,12 @@ package kernfs 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 |