diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-08 19:20:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-08 19:20:35 +0000 |
| commit | 936d44161505242f5dea33ec1db1d5d1b5d19068 (patch) | |
| tree | b1493546838318dd1d98cb94566a539d6c7f2f0e /pkg/sentry/fsimpl/kernfs | |
| parent | 4b54cf560806d545a938f0722e8457b643156744 (diff) | |
| parent | d35f07b36a40ee94b3a5b588a5fa62572753c620 (diff) | |
Merge release-20200818.0-127-gd35f07b36 (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 0269851c9..79863b3bc 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 866620ef9..478b04bdd 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 |