summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-17 23:00:11 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-17 23:00:11 +0000
commitb6a01469186d05a1f8dd0edc27c9363fe0ba446c (patch)
tree17358385dcccdd43f6b79d4827ae5658c2155079 /pkg/sentry/fsimpl
parent37502a997ebf32f89ab5f223e3eddcbd61e37f23 (diff)
parent1b938ba72c79c6e650c7406fcf26e6fdbc219fc6 (diff)
Merge release-20200810.0-43-g1b938ba72 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl')
-rw-r--r--pkg/sentry/fsimpl/tmpfs/inode_refs.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/tmpfs/inode_refs.go b/pkg/sentry/fsimpl/tmpfs/inode_refs.go
index 8b7ff185f..38eddde7e 100644
--- a/pkg/sentry/fsimpl/tmpfs/inode_refs.go
+++ b/pkg/sentry/fsimpl/tmpfs/inode_refs.go
@@ -1,11 +1,10 @@
package tmpfs
import (
- "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