diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-27 00:04:06 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-27 00:04:06 +0000 |
| commit | 4a42e7524518af56e34a922ddc717e963594f9a3 (patch) | |
| tree | 3eeeb3418cae706f2d0989ecf5e09634f0781c74 /pkg/sentry/fsimpl | |
| parent | 1295a9562a49567c519b5115afd836297a0a73f0 (diff) | |
| parent | 7b8f19dc76a9fecbf4d2e5f43a47c6d47d53e100 (diff) | |
Merge release-20211019.0-44-g7b8f19dc7 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl')
| -rw-r--r-- | pkg/sentry/fsimpl/mqfs/registry.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/overlay/overlay.go | 5 |
2 files changed, 2 insertions, 8 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, diff --git a/pkg/sentry/fsimpl/overlay/overlay.go b/pkg/sentry/fsimpl/overlay/overlay.go index 46d9f1f1d..327c37477 100644 --- a/pkg/sentry/fsimpl/overlay/overlay.go +++ b/pkg/sentry/fsimpl/overlay/overlay.go @@ -314,10 +314,7 @@ func clonePrivateMount(vfsObj *vfs.VirtualFilesystem, vd vfs.VirtualDentry, forc if forceReadOnly { opts.ReadOnly = true } - newmnt, err := vfsObj.NewDisconnectedMount(oldmnt.Filesystem(), vd.Dentry(), &opts) - if err != nil { - return vfs.VirtualDentry{}, err - } + newmnt := vfsObj.NewDisconnectedMount(oldmnt.Filesystem(), vd.Dentry(), &opts) // Take a reference on the dentry which will be owned by the returned // VirtualDentry. d := vd.Dentry() |