summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl/mqfs
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-10-27 00:04:06 +0000
committergVisor bot <gvisor-bot@google.com>2021-10-27 00:04:06 +0000
commit4a42e7524518af56e34a922ddc717e963594f9a3 (patch)
tree3eeeb3418cae706f2d0989ecf5e09634f0781c74 /pkg/sentry/fsimpl/mqfs
parent1295a9562a49567c519b5115afd836297a0a73f0 (diff)
parent7b8f19dc76a9fecbf4d2e5f43a47c6d47d53e100 (diff)
Merge release-20211019.0-44-g7b8f19dc7 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/mqfs')
-rw-r--r--pkg/sentry/fsimpl/mqfs/registry.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/sentry/fsimpl/mqfs/registry.go b/pkg/sentry/fsimpl/mqfs/registry.go
index e470ffadc..69182965c 100644
--- a/pkg/sentry/fsimpl/mqfs/registry.go
+++ b/pkg/sentry/fsimpl/mqfs/registry.go
@@ -71,10 +71,7 @@ func NewRegistryImpl(ctx context.Context, vfsObj *vfs.VirtualFilesystem, creds *
var dentry kernfs.Dentry
dentry.InitRoot(&fs.Filesystem, fs.newRootInode(ctx, creds))
- mount, err := vfsObj.NewDisconnectedMount(vfsfs, dentry.VFSDentry(), &vfs.MountOptions{})
- if err != nil {
- return nil, err
- }
+ mount := vfsObj.NewDisconnectedMount(vfsfs, dentry.VFSDentry(), &vfs.MountOptions{})
return &RegistryImpl{
root: &dentry,