summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-22 03:08:54 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-22 03:08:54 +0000
commit06ae0990afabda11a2ae702157e08012f5b48f15 (patch)
tree88d5f517d70f43490f98c028bc1ad70e80575c76 /runsc/boot
parent78348244b45b27891d0585b18c63c2d750cf9260 (diff)
parent17bc5c1b00ce0bb9944507b40b4bb6968bcdbe75 (diff)
Merge release-20200810.0-90-g17bc5c1b0 (automated)
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/vfs.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go
index fb200e988..66b6cf19b 100644
--- a/runsc/boot/vfs.go
+++ b/runsc/boot/vfs.go
@@ -292,7 +292,7 @@ func (c *containerMounter) mountSubmountVFS2(ctx context.Context, conf *config.C
return nil, nil
}
- if err := c.k.VFS().MkdirAllAt(ctx, submount.Destination, root, creds, &vfs.MkdirOptions{Mode: 0777, ForSyntheticMountpoint: true}); err != nil {
+ if err := c.k.VFS().MakeSyntheticMountpoint(ctx, submount.Destination, root, creds); err != nil {
return nil, err
}
mnt, err := c.k.VFS().MountAt(ctx, creds, "", target, fsName, opts)
@@ -496,7 +496,7 @@ func (c *containerMounter) mountSharedSubmountVFS2(ctx context.Context, conf *co
root := mns.Root()
defer root.DecRef(ctx)
- if err := c.k.VFS().MkdirAllAt(ctx, mount.Destination, root, creds, &vfs.MkdirOptions{Mode: 0777, ForSyntheticMountpoint: true}); err != nil {
+ if err := c.k.VFS().MakeSyntheticMountpoint(ctx, mount.Destination, root, creds); err != nil {
return nil, err
}