Merge release-20211019.0-44-g7b8f19dc7 (automated)

2 files changed, 2 insertions, 9 deletions

diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index dbb02fdf4..247f0d54a 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -411,11 +411,7 @@ func New(args Args) (*Loader, error) {
 			return nil, fmt.Errorf("failed to create hostfs filesystem: %w", err)
 		}
 		defer hostFilesystem.DecRef(k.SupervisorContext())
-		hostMount, err := k.VFS().NewDisconnectedMount(hostFilesystem, nil, &vfs.MountOptions{})
-		if err != nil {
-			return nil, fmt.Errorf("failed to create hostfs mount: %w", err)
-		}
-		k.SetHostMount(hostMount)
+		k.SetHostMount(k.VFS().NewDisconnectedMount(hostFilesystem, nil, &vfs.MountOptions{}))
 	}
 
 	eid := execID{cid: args.ID}
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go
index 9f0d1ae36..4d0cfc94a 100644
--- a/runsc/boot/vfs.go
+++ b/runsc/boot/vfs.go
@@ -769,10 +769,7 @@ func (c *containerMounter) mountSharedSubmountVFS2(ctx context.Context, conf *co
 	if err != nil {
 		return nil, err
 	}
-	newMnt, err := c.k.VFS().NewDisconnectedMount(source.vfsMount.Filesystem(), source.vfsMount.Root(), opts)
-	if err != nil {
-		return nil, err
-	}
+	newMnt := c.k.VFS().NewDisconnectedMount(source.vfsMount.Filesystem(), source.vfsMount.Root(), opts)
 	defer newMnt.DecRef(ctx)
 
 	root := mns.Root()