diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-18 18:10:49 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-18 18:10:49 +0000 |
| commit | 6361695629183cdb80f0afb0dfc47b048e5e6c17 (patch) | |
| tree | 5714a20d566eac9958427f6d2370e2c1bfca521d /pkg/sentry/fsimpl/devpts | |
| parent | 9948061e71c3779a27fc197f3306692436abcc5a (diff) | |
| parent | dedef439230eac64a98ef1ce2d3b213bb2865400 (diff) | |
Merge release-20200907.0-144-gdedef4392 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/devpts')
| -rw-r--r-- | pkg/sentry/fsimpl/devpts/devpts.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/devpts/root_inode_refs.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/devpts/devpts.go b/pkg/sentry/fsimpl/devpts/devpts.go index dcf1ee25b..f0f2e0be7 100644 --- a/pkg/sentry/fsimpl/devpts/devpts.go +++ b/pkg/sentry/fsimpl/devpts/devpts.go @@ -237,7 +237,7 @@ func (i *rootInode) IterDirents(ctx context.Context, cb vfs.IterDirentsCallback, return offset, nil } -// DecRef implements kernfs.Inode. +// DecRef implements kernfs.Inode.DecRef. func (i *rootInode) DecRef(context.Context) { i.rootInodeRefs.DecRef(i.Destroy) } diff --git a/pkg/sentry/fsimpl/devpts/root_inode_refs.go b/pkg/sentry/fsimpl/devpts/root_inode_refs.go index b860819f0..051801202 100644 --- a/pkg/sentry/fsimpl/devpts/root_inode_refs.go +++ b/pkg/sentry/fsimpl/devpts/root_inode_refs.go @@ -1,12 +1,12 @@ package devpts 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 |