diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-02 04:07:02 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-02 04:07:02 +0000 |
| commit | 0c18ed111c22f59bca103a69bceb632cd0348a54 (patch) | |
| tree | 1c6d481073caa105b893c16cddcd38a3083218fa /pkg/sentry/fsimpl/kernfs | |
| parent | 2e80f58b0d18b8dd122dc192a1cef9aa6a2da56f (diff) | |
| parent | 563f28b7d56c11a418856f1defeb64e72beb0e9a (diff) | |
Merge release-20200818.0-106-g563f28b7d (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 |