diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-02-05 14:43:11 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-02-05 14:43:11 -0800 |
| commit | bf0ea204e9415a181c63ee10078cca753df14f7e (patch) | |
| tree | f4d149ac2bf2ea900f8b2a0cdea0a7a2ea7e6d0e /pkg/sentry/fsimpl/devtmpfs | |
| parent | 29ad5762e4549d961f48c65292cfdeb7256524f6 (diff) | |
| parent | f2d3efca1deded31a2929ea77c0eecf476764660 (diff) | |
Merge branch 'master' into tcp-matchers-submit
Diffstat (limited to 'pkg/sentry/fsimpl/devtmpfs')
| -rw-r--r-- | pkg/sentry/fsimpl/devtmpfs/devtmpfs.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/devtmpfs/devtmpfs_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go b/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go index d36fa74fb..e03a0c665 100644 --- a/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go +++ b/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go @@ -86,7 +86,7 @@ func NewAccessor(ctx context.Context, vfsObj *vfs.VirtualFilesystem, creds *auth // Release must be called when a is no longer in use. func (a *Accessor) Release() { a.root.DecRef() - a.mntns.DecRef(a.vfsObj) + a.mntns.DecRef() } // accessorContext implements context.Context by extending an existing diff --git a/pkg/sentry/fsimpl/devtmpfs/devtmpfs_test.go b/pkg/sentry/fsimpl/devtmpfs/devtmpfs_test.go index 82c58c900..73308a2b5 100644 --- a/pkg/sentry/fsimpl/devtmpfs/devtmpfs_test.go +++ b/pkg/sentry/fsimpl/devtmpfs/devtmpfs_test.go @@ -45,7 +45,7 @@ func TestDevtmpfs(t *testing.T) { if err != nil { t.Fatalf("failed to create tmpfs root mount: %v", err) } - defer mntns.DecRef(vfsObj) + defer mntns.DecRef() root := mntns.Root() defer root.DecRef() devpop := vfs.PathOperation{ |