From 3e9b8ecbfe21ba6c8c788be469fc6cea6a4a40b7 Mon Sep 17 00:00:00 2001
From: Ian Gudger <igudger@google.com>
Date: Thu, 13 Jun 2019 18:39:43 -0700
Subject: Plumb context through more layers of filesytem.

All functions which allocate objects containing AtomicRefCounts will soon need
a context.

PiperOrigin-RevId: 253147709
---
 pkg/sentry/fs/inode_overlay_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg/sentry/fs/inode_overlay_test.go')

diff --git a/pkg/sentry/fs/inode_overlay_test.go b/pkg/sentry/fs/inode_overlay_test.go
index 7e56d5969..8935aad65 100644
--- a/pkg/sentry/fs/inode_overlay_test.go
+++ b/pkg/sentry/fs/inode_overlay_test.go
@@ -275,12 +275,12 @@ func TestLookupRevalidation(t *testing.T) {
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
-			root := fs.NewDirent(newTestRamfsDir(ctx, nil, nil), "root")
+			root := fs.NewDirent(ctx, newTestRamfsDir(ctx, nil, nil), "root")
 			ctx = &rootContext{
 				Context: ctx,
 				root:    root,
 			}
-			overlay := fs.NewDirent(fs.NewTestOverlayDir(ctx, tc.upper, tc.lower, tc.revalidate), "overlay")
+			overlay := fs.NewDirent(ctx, fs.NewTestOverlayDir(ctx, tc.upper, tc.lower, tc.revalidate), "overlay")
 			// Lookup the file twice through the overlay.
 			first, err := overlay.Walk(ctx, root, fileName)
 			if err != nil {
@@ -442,7 +442,7 @@ func (f *dirFile) Readdir(ctx context.Context, file *fs.File, ser fs.DentrySeria
 }
 
 func newTestRamfsInode(ctx context.Context, msrc *fs.MountSource) *fs.Inode {
-	inode := fs.NewInode(&inode{
+	inode := fs.NewInode(ctx, &inode{
 		InodeStaticFileGetter: fsutil.InodeStaticFileGetter{
 			Contents: []byte("foobar"),
 		},
@@ -451,7 +451,7 @@ func newTestRamfsInode(ctx context.Context, msrc *fs.MountSource) *fs.Inode {
 }
 
 func newTestRamfsDir(ctx context.Context, contains []dirContent, negative []string) *fs.Inode {
-	msrc := fs.NewPseudoMountSource()
+	msrc := fs.NewPseudoMountSource(ctx)
 	contents := make(map[string]*fs.Inode)
 	for _, c := range contains {
 		if c.dir {
@@ -463,7 +463,7 @@ func newTestRamfsDir(ctx context.Context, contains []dirContent, negative []stri
 	dops := ramfs.NewDir(ctx, contents, fs.RootOwner, fs.FilePermissions{
 		User: fs.PermMask{Read: true, Execute: true},
 	})
-	return fs.NewInode(&dir{
+	return fs.NewInode(ctx, &dir{
 		InodeOperations: dops,
 		negative:        negative,
 	}, msrc, fs.StableAttr{Type: fs.Directory})
-- 
cgit v1.2.3