diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-27 23:45:00 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-27 23:45:00 +0000 |
| commit | e26ce51d1a5e6ccdcf2dcb10aaf761e0264f7d51 (patch) | |
| tree | a5a77be1c312396dd4e57482cb7213bf6f0a3910 /pkg/sentry/fs/host/file.go | |
| parent | 39fc573e80eca187af64379bbf178da39a94cd29 (diff) | |
| parent | 0e2f1b7abd219f39d67cc2cecd00c441a13eeb29 (diff) | |
Merge release-20200115.0-110-g0e2f1b7 (automated)
Diffstat (limited to 'pkg/sentry/fs/host/file.go')
| -rw-r--r-- | pkg/sentry/fs/host/file.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fs/host/file.go b/pkg/sentry/fs/host/file.go index f6c626f2c..e08f56d04 100644 --- a/pkg/sentry/fs/host/file.go +++ b/pkg/sentry/fs/host/file.go @@ -18,17 +18,17 @@ import ( "fmt" "syscall" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/fd" "gvisor.dev/gvisor/pkg/fdnotifier" "gvisor.dev/gvisor/pkg/log" + "gvisor.dev/gvisor/pkg/safemem" "gvisor.dev/gvisor/pkg/secio" - "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" "gvisor.dev/gvisor/pkg/sentry/memmap" - "gvisor.dev/gvisor/pkg/sentry/safemem" - "gvisor.dev/gvisor/pkg/sentry/usermem" "gvisor.dev/gvisor/pkg/syserror" + "gvisor.dev/gvisor/pkg/usermem" "gvisor.dev/gvisor/pkg/waiter" ) |