diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-17 17:07:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-17 17:07:17 +0000 |
| commit | 82621396212fecc1b57207192a34424491333c5a (patch) | |
| tree | b1f1ab02cda0878677fc5ce55b75a30a6cba9e13 /pkg/sentry/fsimpl/pipefs | |
| parent | f7a93e64341c0ffe1c239b633051d8172b0b04b3 (diff) | |
| parent | 96519e2c9d3fa1f15537c4dfc081a19d8d1ce1a2 (diff) | |
Merge release-20200608.0-69-g96519e2c9 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/pipefs')
| -rw-r--r-- | pkg/sentry/fsimpl/pipefs/pipefs.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/pipefs/pipefs.go b/pkg/sentry/fsimpl/pipefs/pipefs.go index e4dabaa33..dd7eaf4a8 100644 --- a/pkg/sentry/fsimpl/pipefs/pipefs.go +++ b/pkg/sentry/fsimpl/pipefs/pipefs.go @@ -27,7 +27,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel/pipe" ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" "gvisor.dev/gvisor/pkg/sentry/vfs" - "gvisor.dev/gvisor/pkg/sentry/vfs/lock" "gvisor.dev/gvisor/pkg/syserror" "gvisor.dev/gvisor/pkg/usermem" ) @@ -82,7 +81,7 @@ type inode struct { kernfs.InodeNotSymlink kernfs.InodeNoopRefCount - locks lock.FileLocks + locks vfs.FileLocks pipe *pipe.VFSPipe ino uint64 |